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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-08-26 15:05 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-08-26 15:05 UTC (permalink / raw
  To: gentoo-commits

commit:     6ed1aaa132a878208ede1cf962aebc9998dbbc13
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Wed Aug 26 15:01:26 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 15:02:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed1aaa1

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.20.1

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.3.9.ebuild | 157 ++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 1d6038f..e91106b 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,3 +2,4 @@ DIST icinga2-2.3.5.tar.gz 804780 SHA256 712d13e997fc6fbf02f8c2046851b1fda1291305
 DIST icinga2-2.3.6.tar.gz 816718 SHA256 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 SHA512 bb16546bce387f4d828c1bba7dc0e5e1e89ca9c8a4bbb931d9fabd3fb0089329751814bee883b3320e0a7a0b2dd26c1e5b2970b2c33fc8172c3e73784d92a960 WHIRLPOOL 21d410a401ac8ada2857640061ede691b0c41b54aca49409fb3e7002195b1975c653351afffd06a375b6a78948ee96e875dcc982971d3332a994752ccc4c80af
 DIST icinga2-2.3.7.tar.gz 817712 SHA256 067335129daf464d800f48d75bf2fde6ae63c99db6a5126d3d322b6562dfdf28 SHA512 46c940b8081dc3e064121acdab366ba28c1156fc563064022099c3186e310d20bcc1743b643046e0579f42e8ea90b9dfa1f868b28df3eedcd18926c7f65c98f6 WHIRLPOOL 5363191df2c5a57d135866589fe683ea53623c3b0583c299e248e32e4822d1f0bb7806ad573ee9ecd402edecb80dc1ced5850550c595b97562126670b74977f9
 DIST icinga2-2.3.8.tar.gz 817951 SHA256 43bf41a7afc03c1527c82139e74cce17c5b3609a8ec14bb0db1f8df193a14054 SHA512 2536725b50ef158ed7447631fe3480dade1f44a86f40d633138cf83a624fee5f605edf075392a68858f5eebfb9ef89cb5ca811d3120ede7a103df9a448cefa55 WHIRLPOOL c768ad6b62a09e1db05220dd91e5c937db792bf1e512385780a613556a9623b9e3b4d2fe355505d674407ed1a4d693bb554f84d1ca03aa08c04743e29a544423
+DIST icinga2-2.3.9.tar.gz 829706 SHA256 af6aa49ac9ce90e2ecf331b092624f5d6462d31ca5b4458db1c3d974391183c3 SHA512 29ec8eb68d77bf2cdb2353bd6d3015d7a5363a3b7979207afb3af26e2de634159d988c7dcb2c979ed8a73fd55c2d42c44f47b35d97fe1fb47783dac8c3593470 WHIRLPOOL 854b86006ddfd85328408248d59b77041a63c2a7b1460c9ea3e344cdc3f375973654109455abd4ed7d376d91a225b37ba318727b49a05d27a9a2938cef956a05

diff --git a/net-analyzer/icinga2/icinga2-2.3.9.ebuild b/net-analyzer/icinga2/icinga2-2.3.9.ebuild
new file mode 100644
index 0000000..c996c27
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.9.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
+src_configure() {
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	if use postgres; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use mysql; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR
+
+	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+
+		emake DESTDIR="${D}" install
+	#fi
+
+	cd "${WORKDIR}"/icinga2-${PV}
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
+	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}var/run" || die "failed to remove /var/run"
+	rm -r "${D}var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/syntax/vim/ftdetect
+		doins -r tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-09-02  3:55 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-09-02  3:55 UTC (permalink / raw
  To: gentoo-commits

commit:     55ed7e0d5f795109e6767b681bc436cbc90a4574
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 03:55:19 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 03:55:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ed7e0d

net-analyzer/icinga2: cleaner minimal usage

Package-Manager: portage-2.2.20.1

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

diff --git a/net-analyzer/icinga2/icinga2-2.3.9.ebuild b/net-analyzer/icinga2/icinga2-2.3.9.ebuild
index c996c27..ac3a260 100644
--- a/net-analyzer/icinga2/icinga2-2.3.9.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.3.9.ebuild
@@ -61,6 +61,12 @@ src_configure() {
 		-DICINGA2_COMMAND_GROUP=icingacmd
 		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
 	)
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
 	if use postgres; then
 		mycmakeargs+=(
 			-DICINGA2_WITH_PGSQL=ON


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-09-05 20:33 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-09-05 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     139b353a3749a8429c04288d0a15c63d45ea206a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 20:32:50 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 20:32:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139b353a

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.20.1

 net-analyzer/icinga2/Manifest              |   1 +
 net-analyzer/icinga2/icinga2-2.3.10.ebuild | 163 +++++++++++++++++++++++++++++
 2 files changed, 164 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index e91106b..765572d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
+DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
 DIST icinga2-2.3.5.tar.gz 804780 SHA256 712d13e997fc6fbf02f8c2046851b1fda1291305f0d3d6792cbebf5fb1558225 SHA512 9302ee2360cbc69ff9bc06092b4ebe9fb77901d9d60eb073f41f781e2917f398ccbddb617bb306631c9d4d0dbe0312cdab6fc1369b2c2691cf116d7af04b1ea7 WHIRLPOOL a73f8ab1136b35283c343281d65e4ea3e78ecdc52a6d1775f3202374a0f5dc9927709e2aa705243243d3c8751e313c60b4d88b1d0f15d1514a50e8a4483d94f6
 DIST icinga2-2.3.6.tar.gz 816718 SHA256 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 SHA512 bb16546bce387f4d828c1bba7dc0e5e1e89ca9c8a4bbb931d9fabd3fb0089329751814bee883b3320e0a7a0b2dd26c1e5b2970b2c33fc8172c3e73784d92a960 WHIRLPOOL 21d410a401ac8ada2857640061ede691b0c41b54aca49409fb3e7002195b1975c653351afffd06a375b6a78948ee96e875dcc982971d3332a994752ccc4c80af
 DIST icinga2-2.3.7.tar.gz 817712 SHA256 067335129daf464d800f48d75bf2fde6ae63c99db6a5126d3d322b6562dfdf28 SHA512 46c940b8081dc3e064121acdab366ba28c1156fc563064022099c3186e310d20bcc1743b643046e0579f42e8ea90b9dfa1f868b28df3eedcd18926c7f65c98f6 WHIRLPOOL 5363191df2c5a57d135866589fe683ea53623c3b0583c299e248e32e4822d1f0bb7806ad573ee9ecd402edecb80dc1ced5850550c595b97562126670b74977f9

diff --git a/net-analyzer/icinga2/icinga2-2.3.10.ebuild b/net-analyzer/icinga2/icinga2-2.3.10.ebuild
new file mode 100644
index 0000000..ac3a260
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.10.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
+src_configure() {
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use postgres; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use mysql; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR
+
+	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+
+		emake DESTDIR="${D}" install
+	#fi
+
+	cd "${WORKDIR}"/icinga2-${PV}
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
+	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}var/run" || die "failed to remove /var/run"
+	rm -r "${D}var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/syntax/vim/ftdetect
+		doins -r tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-09-08  1:29 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-09-08  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6d7fdaee3ba8d986a4d26fc881bc2c88f86b2179
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 01:29:00 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 01:29:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7fdaee

net-analyzer/icinga2: fixing the glaring bug

Package-Manager: portage-2.2.20.1

 net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild | 133 ++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
new file mode 100644
index 0000000..fc4c95a
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( 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() {
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-09-28 10:12 Agostino Sarubbo
  0 siblings, 0 replies; 176+ messages in thread
From: Agostino Sarubbo @ 2015-09-28 10:12 UTC (permalink / raw
  To: gentoo-commits

commit:     da237baf51c3519cc9c95b35aeb3703f6cf382cb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 10:12:17 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 10:12:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da237baf

net-analyzer/icinga2: amd64 stable wrt bug #561584

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

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

diff --git a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
index fc4c95a..891be36 100644
--- a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-09-28 17:14 Mikle Kolyada
  0 siblings, 0 replies; 176+ messages in thread
From: Mikle Kolyada @ 2015-09-28 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e0b46e9178b2fc5c3b790293baa3b0dd46d0f9a4
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 17:11:41 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 17:11:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b46e91

net-analyzer/icinga2: x86 stable wrt bug #561584

Package-Manager: portage-2.2.20.1

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

diff --git a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
index 891be36..d2d8393 100644
--- a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-09-28 17:35 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-09-28 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     ef879b4bd3fd2c18942a43769bed60f5800786ae
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Sep 28 17:31:06 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 17:34:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef879b4b

cleaning up non-stable and updating git ebuild

 net-analyzer/icinga2/icinga2-2.3.10.ebuild | 163 -----------------------------
 net-analyzer/icinga2/icinga2-2.3.5.ebuild  | 158 ----------------------------
 net-analyzer/icinga2/icinga2-2.3.6.ebuild  | 157 ---------------------------
 net-analyzer/icinga2/icinga2-2.3.7.ebuild  | 157 ---------------------------
 net-analyzer/icinga2/icinga2-2.3.8.ebuild  | 157 ---------------------------
 net-analyzer/icinga2/icinga2-2.3.9.ebuild  | 163 -----------------------------
 net-analyzer/icinga2/icinga2-9999.ebuild   |  60 ++++-------
 7 files changed, 18 insertions(+), 997 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.3.10.ebuild b/net-analyzer/icinga2/icinga2-2.3.10.ebuild
deleted file mode 100644
index ac3a260..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.10.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
-src_configure() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use postgres; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use mysql; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
-
-	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-
-		emake DESTDIR="${D}" install
-	#fi
-
-	cd "${WORKDIR}"/icinga2-${PV}
-	if ! declare -p DOCS >/dev/null 2>&1 ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-				FAQ CREDITS CHANGELOG ; do
-			[[ -s "${d}" ]] && dodoc "${d}"
-		done
-	elif declare -p DOCS | grep -q "^declare -a " ; then
-		dodoc "${DOCS[@]}"
-	else
-		dodoc ${DOCS}
-	fi
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-	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}var/run" || die "failed to remove /var/run"
-	rm -r "${D}var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.3.5.ebuild b/net-analyzer/icinga2/icinga2-2.3.5.ebuild
deleted file mode 100644
index bffb07c..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.5.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-util/cmake
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
-src_configure() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	if use postgres; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use mysql; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
-
-	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-
-		emake DESTDIR="${D}" install
-	#fi
-
-	cd "${WORKDIR}"/icinga2-${PV}
-	if ! declare -p DOCS >/dev/null 2>&1 ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-				FAQ CREDITS CHANGELOG ; do
-			[[ -s "${d}" ]] && dodoc "${d}"
-		done
-	elif declare -p DOCS | grep -q "^declare -a " ; then
-		dodoc "${DOCS[@]}"
-	else
-		dodoc ${DOCS}
-	fi
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-	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}var/run" || die "failed to remove /var/run"
-	rm -r "${D}var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.3.6.ebuild b/net-analyzer/icinga2/icinga2-2.3.6.ebuild
deleted file mode 100644
index c996c27..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.6.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
-src_configure() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	if use postgres; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use mysql; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
-
-	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-
-		emake DESTDIR="${D}" install
-	#fi
-
-	cd "${WORKDIR}"/icinga2-${PV}
-	if ! declare -p DOCS >/dev/null 2>&1 ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-				FAQ CREDITS CHANGELOG ; do
-			[[ -s "${d}" ]] && dodoc "${d}"
-		done
-	elif declare -p DOCS | grep -q "^declare -a " ; then
-		dodoc "${DOCS[@]}"
-	else
-		dodoc ${DOCS}
-	fi
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-	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}var/run" || die "failed to remove /var/run"
-	rm -r "${D}var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.3.7.ebuild b/net-analyzer/icinga2/icinga2-2.3.7.ebuild
deleted file mode 100644
index c996c27..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.7.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
-src_configure() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	if use postgres; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use mysql; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
-
-	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-
-		emake DESTDIR="${D}" install
-	#fi
-
-	cd "${WORKDIR}"/icinga2-${PV}
-	if ! declare -p DOCS >/dev/null 2>&1 ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-				FAQ CREDITS CHANGELOG ; do
-			[[ -s "${d}" ]] && dodoc "${d}"
-		done
-	elif declare -p DOCS | grep -q "^declare -a " ; then
-		dodoc "${DOCS[@]}"
-	else
-		dodoc ${DOCS}
-	fi
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-	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}var/run" || die "failed to remove /var/run"
-	rm -r "${D}var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.3.8.ebuild b/net-analyzer/icinga2/icinga2-2.3.8.ebuild
deleted file mode 100644
index c996c27..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.8.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
-src_configure() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	if use postgres; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use mysql; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
-
-	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-
-		emake DESTDIR="${D}" install
-	#fi
-
-	cd "${WORKDIR}"/icinga2-${PV}
-	if ! declare -p DOCS >/dev/null 2>&1 ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-				FAQ CREDITS CHANGELOG ; do
-			[[ -s "${d}" ]] && dodoc "${d}"
-		done
-	elif declare -p DOCS | grep -q "^declare -a " ; then
-		dodoc "${DOCS[@]}"
-	else
-		dodoc ${DOCS}
-	fi
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-	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}var/run" || die "failed to remove /var/run"
-	rm -r "${D}var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.3.9.ebuild b/net-analyzer/icinga2/icinga2-2.3.9.ebuild
deleted file mode 100644
index ac3a260..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.9.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
-src_configure() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use postgres; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	fi
-	if use mysql; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
-
-	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-
-		emake DESTDIR="${D}" install
-	#fi
-
-	cd "${WORKDIR}"/icinga2-${PV}
-	if ! declare -p DOCS >/dev/null 2>&1 ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-				FAQ CREDITS CHANGELOG ; do
-			[[ -s "${d}" ]] && dodoc "${d}"
-		done
-	elif declare -p DOCS | grep -q "^declare -a " ; then
-		dodoc "${DOCS[@]}"
-	else
-		dodoc ${DOCS}
-	fi
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-	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}var/run" || die "failed to remove /var/run"
-	rm -r "${D}var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 3e3a162..14453a2 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user versionator
+inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
 HOMEPAGE="http://icinga.org/icinga2"
@@ -12,11 +12,11 @@ EGIT_BRANCH="master"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="amd64 x86"
 IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
 
 DEPEND="
-	dev-libs/openssl:=
+	dev-libs/openssl:0
 	>=dev-libs/boost-1.41
 	sys-devel/bison
 	>=sys-devel/flex-2.5.35
@@ -36,17 +36,13 @@ REQUIRED_USE="!minimal? ( || ( 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_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DICINGA2_UNITY_BUILD=FALSE
@@ -62,22 +58,16 @@ src_configure() {
 		-DICINGA2_COMMAND_GROUP=icingacmd
 		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
 	)
-	if use postgres; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=ON
-		)
-	else
+	# 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
 		)
-	fi
-	if use mysql; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=ON
-		)
 	else
 		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
 		)
 	fi
 	cmake-utils_src_configure
@@ -87,23 +77,9 @@ src_install() {
 	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
 	cd $BUILDDIR
 
-	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+	emake DESTDIR="${D}" install
 
-		emake DESTDIR="${D}" install
-	#fi
-
-	cd "${WORKDIR}"/icinga2-${PV}
-	if ! declare -p DOCS >/dev/null 2>&1 ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-				FAQ CREDITS CHANGELOG ; do
-			[[ -s "${d}" ]] && dodoc "${d}"
-		done
-	elif declare -p DOCS | grep -q "^declare -a " ; then
-		dodoc "${DOCS[@]}"
-	else
-		dodoc ${DOCS}
-	fi
+	einstalldocs
 
 	newinitd "${FILESDIR}"/icinga2.initd icinga2
 	newconfd "${FILESDIR}"/icinga2.confd icinga2
@@ -112,12 +88,12 @@ src_install() {
 		docinto schema
 		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
 		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
 	elif use postgres ; then
 		docinto schema
 		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
 		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
 	fi
 
 	keepdir /etc/icinga2
@@ -126,8 +102,8 @@ 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}var/cache" || die "failed to remove /var/cache"
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
 
 	fowners icinga:icinga /etc/icinga2
 	fowners icinga:icinga /var/lib/icinga2
@@ -142,13 +118,13 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
 	fi
 
 	if use nano-syntax; then
 		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-09-29 14:52 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-09-29 14:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d036c3edd661fbad8e097527f6a2cef597a97159
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 14:51:59 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 14:51:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d036c3ed

net-analyzer/icinga2: remasking 9999 for bug 561802

Package-Manager: portage-2.2.20.1

 net-analyzer/icinga2/Manifest            | 5 -----
 net-analyzer/icinga2/icinga2-9999.ebuild | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 765572d..bb0724a 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,6 +1 @@
 DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
-DIST icinga2-2.3.5.tar.gz 804780 SHA256 712d13e997fc6fbf02f8c2046851b1fda1291305f0d3d6792cbebf5fb1558225 SHA512 9302ee2360cbc69ff9bc06092b4ebe9fb77901d9d60eb073f41f781e2917f398ccbddb617bb306631c9d4d0dbe0312cdab6fc1369b2c2691cf116d7af04b1ea7 WHIRLPOOL a73f8ab1136b35283c343281d65e4ea3e78ecdc52a6d1775f3202374a0f5dc9927709e2aa705243243d3c8751e313c60b4d88b1d0f15d1514a50e8a4483d94f6
-DIST icinga2-2.3.6.tar.gz 816718 SHA256 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 SHA512 bb16546bce387f4d828c1bba7dc0e5e1e89ca9c8a4bbb931d9fabd3fb0089329751814bee883b3320e0a7a0b2dd26c1e5b2970b2c33fc8172c3e73784d92a960 WHIRLPOOL 21d410a401ac8ada2857640061ede691b0c41b54aca49409fb3e7002195b1975c653351afffd06a375b6a78948ee96e875dcc982971d3332a994752ccc4c80af
-DIST icinga2-2.3.7.tar.gz 817712 SHA256 067335129daf464d800f48d75bf2fde6ae63c99db6a5126d3d322b6562dfdf28 SHA512 46c940b8081dc3e064121acdab366ba28c1156fc563064022099c3186e310d20bcc1743b643046e0579f42e8ea90b9dfa1f868b28df3eedcd18926c7f65c98f6 WHIRLPOOL 5363191df2c5a57d135866589fe683ea53623c3b0583c299e248e32e4822d1f0bb7806ad573ee9ecd402edecb80dc1ced5850550c595b97562126670b74977f9
-DIST icinga2-2.3.8.tar.gz 817951 SHA256 43bf41a7afc03c1527c82139e74cce17c5b3609a8ec14bb0db1f8df193a14054 SHA512 2536725b50ef158ed7447631fe3480dade1f44a86f40d633138cf83a624fee5f605edf075392a68858f5eebfb9ef89cb5ca811d3120ede7a103df9a448cefa55 WHIRLPOOL c768ad6b62a09e1db05220dd91e5c937db792bf1e512385780a613556a9623b9e3b4d2fe355505d674407ed1a4d693bb554f84d1ca03aa08c04743e29a544423
-DIST icinga2-2.3.9.tar.gz 829706 SHA256 af6aa49ac9ce90e2ecf331b092624f5d6462d31ca5b4458db1c3d974391183c3 SHA512 29ec8eb68d77bf2cdb2353bd6d3015d7a5363a3b7979207afb3af26e2de634159d988c7dcb2c979ed8a73fd55c2d42c44f47b35d97fe1fb47783dac8c3593470 WHIRLPOOL 854b86006ddfd85328408248d59b77041a63c2a7b1460c9ea3e344cdc3f375973654109455abd4ed7d376d91a225b37ba318727b49a05d27a9a2938cef956a05

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 14453a2..5d9ca2c 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_BRANCH="master"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS=""
 IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-10-19 16:04 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-10-19 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     532e23e2669d840b5a9cd3d37462497f4b619f27
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 16:04:12 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 16:04:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532e23e2

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.20.1

 net-analyzer/icinga2/Manifest              |   1 +
 net-analyzer/icinga2/icinga2-2.3.11.ebuild | 133 +++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bb0724a..bd5eb69 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
+DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277

diff --git a/net-analyzer/icinga2/icinga2-2.3.11.ebuild b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
new file mode 100644
index 0000000..ca3ec56
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( 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() {
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-10-19 22:29 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-10-19 22:29 UTC (permalink / raw
  To: gentoo-commits

commit:     53aace4c6fa94a349ada4d25c912d8d8edd49c6d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:29:34 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 22:29:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53aace4c

net-analyzer/icinga2: fixing missing quotes

Package-Manager: portage-2.2.20.1

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

diff --git a/net-analyzer/icinga2/icinga2-2.3.11.ebuild b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
index ca3ec56..176442c 100644
--- a/net-analyzer/icinga2/icinga2-2.3.11.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
@@ -74,7 +74,7 @@ src_configure() {
 
 src_install() {
 	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR || die
+	cd "${BUILDDIR}" || die
 
 	emake DESTDIR="${D}" install
 

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 5d9ca2c..196d611 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -75,7 +75,7 @@ src_configure() {
 
 src_install() {
 	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
+	cd "${BUILDDIR}" || die
 
 	emake DESTDIR="${D}" install
 


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-11-16  8:30 Mikle Kolyada
  0 siblings, 0 replies; 176+ messages in thread
From: Mikle Kolyada @ 2015-11-16  8:30 UTC (permalink / raw
  To: gentoo-commits

commit:     46671da1aa4e8b540a860b6e1473b79dab600ab8
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 08:27:33 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 08:27:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46671da1

net-analyzer/icinga2: amd64 stable wrt bug #565892

Package-Manager: portage-2.2.20.1

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

diff --git a/net-analyzer/icinga2/icinga2-2.3.11.ebuild b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
index 176442c..0e4b4ce 100644
--- a/net-analyzer/icinga2/icinga2-2.3.11.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-11-16 16:04 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-11-16 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     310b14952d1b298d861c0e28b234933ccdbf7ad0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 16:04:02 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 16:04:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=310b1495

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.20.1

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.4.0.ebuild | 133 ++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bd5eb69..481303c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
 DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
+DIST icinga2-2.4.0.tar.gz 1338579 SHA256 928d6bfb64078ed4d8223a4b3db67ee8d8fb9d0065a43a10642b628181c52605 SHA512 f81b0eb0e892afeb0a6a673bdf776ba1828638a04e26a0a834204f29b5ee42fa744e1ef3df9c77c4c841580490df3435ceda5f97f826b1b97bcda9c9aa3fe53f WHIRLPOOL ef77641f353954435a5c9c33a97f78307a79e71f450a5e14a81253831e35b1986df39ff366e6dd376843bd2d746bb950f51db971e209601dfca5fd14a5a94203

diff --git a/net-analyzer/icinga2/icinga2-2.4.0.ebuild b/net-analyzer/icinga2/icinga2-2.4.0.ebuild
new file mode 100644
index 0000000..176442c
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( 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() {
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-11-20  1:04 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-11-20  1:04 UTC (permalink / raw
  To: gentoo-commits

commit:     5c00b316ef0247c9cba56dad7c57ae0b7ad9a043
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 01:04:00 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 01:04:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c00b316

net-analyzer/icinga2: add support for lto and icinga studio

Package-Manager: portage-2.2.20.1

 net-analyzer/icinga2/icinga2-2.4.0-r1.ebuild | 155 +++++++++++++++++++++++++++
 net-analyzer/icinga2/metadata.xml            |   2 +
 2 files changed, 157 insertions(+)

diff --git a/net-analyzer/icinga2/icinga2-2.4.0-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.0-r1.ebuild
new file mode 100644
index 0000000..d81544d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.0-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( >=x11-libs/wxGTK-2.9.0.0 )"
+
+REQUIRED_USE="!minimal? ( || ( 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() {
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}

diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 1eb8333..cbe5b84 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="classicui">Adds support for the old interface</flag>
+		<flag name="lto">Adds support for link time optimization</flag>
+		<flag name="studio">Adds support for Icinga-studio</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-11-28 20:12 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-11-28 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e94aced02486a911d5aa6f143670e1b114e846e4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 20:12:15 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 20:12:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94aced0

bup

 net-analyzer/icinga2/Manifest                                          | 1 +
 net-analyzer/icinga2/{icinga2-2.4.0-r1.ebuild => icinga2-2.4.1.ebuild} | 0
 2 files changed, 1 insertion(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 481303c..dc6eae7 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
 DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
 DIST icinga2-2.4.0.tar.gz 1338579 SHA256 928d6bfb64078ed4d8223a4b3db67ee8d8fb9d0065a43a10642b628181c52605 SHA512 f81b0eb0e892afeb0a6a673bdf776ba1828638a04e26a0a834204f29b5ee42fa744e1ef3df9c77c4c841580490df3435ceda5f97f826b1b97bcda9c9aa3fe53f WHIRLPOOL ef77641f353954435a5c9c33a97f78307a79e71f450a5e14a81253831e35b1986df39ff366e6dd376843bd2d746bb950f51db971e209601dfca5fd14a5a94203
+DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20

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


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-11-28 20:19 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-11-28 20:19 UTC (permalink / raw
  To: gentoo-commits

commit:     61cef32fd37c74020e705a48e09f2abebbbebe48
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 20:18:30 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 20:18:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cef32f

fixing wxgtk dep

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.1.ebuild b/net-analyzer/icinga2/icinga2-2.4.1.ebuild
index d81544d..b7cde9f 100644
--- a/net-analyzer/icinga2/icinga2-2.4.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 		net-analyzer/nagios-plugins
 	) )
 	classicui? ( net-analyzer/icinga[web] )
-	studio? ( >=x11-libs/wxGTK-2.9.0.0 )"
+	studio? ( x11-libs/wxGTK:2.9 )"
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2015-12-25 20:20 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2015-12-25 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     497f43cb722fdae31bf1fc0aeef94d8c806bfd43
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 20:19:42 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 20:20:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=497f43cb

net-analyzer/icinga2: fix bug 567050 (always building with debug flags)

Package-Manager: portage-2.2.24

 net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild | 156 +++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild
new file mode 100644
index 0000000..c1aeb36
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( 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\}\ /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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-01-05 15:26 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-01-05 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     669ba3f870b33b508fa4c5882b4285be2060c531
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 15:24:12 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 15:24:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669ba3f8

net-analyzer/icinga2: hopefully fixing the lpthread issue

Package-Manager: portage-2.2.26

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild
new file mode 100644
index 0000000..32ba9d4
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-01-05 15:31 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-01-05 15:31 UTC (permalink / raw
  To: gentoo-commits

commit:     cf26d20dc70df53baaba6b59e9e1c3ca52b60617
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 15:30:42 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 15:30:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf26d20d

net-analyzer/icinga2: fixing bad dir ownership for bug 570946

Package-Manager: portage-2.2.26

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild
index 32ba9d4..db38f47 100644
--- a/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild
@@ -130,6 +130,7 @@ src_install() {
 	fowners icinga:icinga /etc/icinga2
 	fowners icinga:icinga /var/lib/icinga2
 	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icingacmd /var/lib/icinga2/api
 	fowners icinga:icinga /var/spool/icinga2/perfdata
 	fowners icinga:icingacmd /var/log/icinga2
 


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-01-18 16:50 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-01-18 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     bee9ab8c82f372244390476298c9ae83a58651d9
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Mon Jan 18 16:43:08 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 16:49:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee9ab8c

net-analyzer/icinga2: add support for console line-editing

Package-Manager: portage-2.2.26
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild | 158 +++++++++++++++++++++++++++
 net-analyzer/icinga2/metadata.xml            |   1 +
 2 files changed, 159 insertions(+)

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild
new file mode 100644
index 0000000..6c6709a
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui console lto minimal nano-syntax +plugins studio +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}

diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index cbe5b84..2f62e60 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="classicui">Adds support for the old interface</flag>
+		<flag name="console">Adds support for line-editing in the console</flag>
 		<flag name="lto">Adds support for link time optimization</flag>
 		<flag name="studio">Adds support for Icinga-studio</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-01-18 17:04 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-01-18 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     59404d4324245bfbd130381a49e65988bb84e789
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 17:02:10 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 17:03:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59404d43

net-analyzer/icinga2: moving flex/bison to depend only

Package-Manager: portage-2.2.26

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild
index 6c6709a..0cc2bd1 100644
--- a/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild
@@ -14,17 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+mysql postgres classicui console lto minimal nano-syntax +plugins studio +vim-syntax"
 
-DEPEND="
+CDEPEND="
 	dev-libs/openssl:0
 	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
 	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )"
 
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
 RDEPEND="
-	${DEPEND}
+	${CDEPEND}
 	plugins? ( || (
 		net-analyzer/monitoring-plugins
 		net-analyzer/nagios-plugins


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-01-21  3:06 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-01-21  3:06 UTC (permalink / raw
  To: gentoo-commits

commit:     dfa579375d091e889b0cf4167ceae687bde73a01
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 03:05:22 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 03:05:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfa57937

net-analyzer/icinga2: adding missing dep and cleanup

Package-Manager: portage-2.2.26

 net-analyzer/icinga2/Manifest                      |   2 -
 net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild      | 133 -----------------
 net-analyzer/icinga2/icinga2-2.4.0.ebuild          | 133 -----------------
 net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild       | 156 --------------------
 net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild       | 157 ---------------------
 ...ga2-2.4.1-r3.ebuild => icinga2-2.4.1-r4.ebuild} |   3 +-
 net-analyzer/icinga2/icinga2-2.4.1.ebuild          | 155 --------------------
 net-analyzer/icinga2/icinga2-9999.ebuild           |  43 +++++-
 net-analyzer/icinga2/metadata.xml                  |   1 +
 9 files changed, 39 insertions(+), 744 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index dc6eae7..ca44478 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,2 @@
-DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
 DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
-DIST icinga2-2.4.0.tar.gz 1338579 SHA256 928d6bfb64078ed4d8223a4b3db67ee8d8fb9d0065a43a10642b628181c52605 SHA512 f81b0eb0e892afeb0a6a673bdf776ba1828638a04e26a0a834204f29b5ee42fa744e1ef3df9c77c4c841580490df3435ceda5f97f826b1b97bcda9c9aa3fe53f WHIRLPOOL ef77641f353954435a5c9c33a97f78307a79e71f450a5e14a81253831e35b1986df39ff366e6dd376843bd2d746bb950f51db971e209601dfca5fd14a5a94203
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20

diff --git a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
deleted file mode 100644
index d2d8393..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( 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() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.4.0.ebuild b/net-analyzer/icinga2/icinga2-2.4.0.ebuild
deleted file mode 100644
index 176442c..0000000
--- a/net-analyzer/icinga2/icinga2-2.4.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( 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() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild
deleted file mode 100644
index c1aeb36..0000000
--- a/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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\}\ /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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild
deleted file mode 100644
index db38f47..0000000
--- a/net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
similarity index 97%
rename from net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild
rename to net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
index 0cc2bd1..3902285 100644
--- a/net-analyzer/icinga2/icinga2-2.4.1-r3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui console lto minimal nano-syntax +plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="
 	dev-libs/openssl:0
@@ -32,6 +32,7 @@ RDEPEND="
 		net-analyzer/monitoring-plugins
 		net-analyzer/nagios-plugins
 	) )
+	mail? ( virtual/mailx )
 	classicui? ( net-analyzer/icinga[web] )
 	studio? ( x11-libs/wxGTK:2.9 )"
 

diff --git a/net-analyzer/icinga2/icinga2-2.4.1.ebuild b/net-analyzer/icinga2/icinga2-2.4.1.ebuild
deleted file mode 100644
index b7cde9f..0000000
--- a/net-analyzer/icinga2/icinga2-2.4.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 196d611..c0f5d91 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,23 +13,29 @@ EGIT_BRANCH="master"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
-DEPEND="
+CDEPEND="
 	dev-libs/openssl:0
 	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
+	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )"
 
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
 RDEPEND="
-	${DEPEND}
+	${CDEPEND}
 	plugins? ( || (
 		net-analyzer/monitoring-plugins
 		net-analyzer/nagios-plugins
 	) )
-	classicui? ( net-analyzer/icinga[web] )"
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:2.9 )"
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
@@ -44,6 +50,7 @@ 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
@@ -70,6 +77,27 @@ src_configure() {
 			-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=OFF
+		)
+	fi
+
 	cmake-utils_src_configure
 }
 
@@ -108,6 +136,7 @@ src_install() {
 	fowners icinga:icinga /etc/icinga2
 	fowners icinga:icinga /var/lib/icinga2
 	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icingacmd /var/lib/icinga2/api
 	fowners icinga:icinga /var/spool/icinga2/perfdata
 	fowners icinga:icingacmd /var/log/icinga2
 

diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 2f62e60..c2818ba 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="classicui">Adds support for the old interface</flag>
 		<flag name="console">Adds support for line-editing in the console</flag>
 		<flag name="lto">Adds support for link time optimization</flag>
+		<flag name="mail">Allows for mailing of alerts</flag>
 		<flag name="studio">Adds support for Icinga-studio</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-01-25 15:44 Agostino Sarubbo
  0 siblings, 0 replies; 176+ messages in thread
From: Agostino Sarubbo @ 2016-01-25 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     8ce000a5de24a3ca5c1bf0f5c713cf1b21735be5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 15:43:52 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 15:43:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ce000a5

net-analyzer/icinga2: amd64 stable wrt bug #572644

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
index 3902285..7203324 100644
--- a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-02-23 19:58 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-02-23 19:58 UTC (permalink / raw
  To: gentoo-commits

commit:     92000a4a8bf0ba9e9e10ffc1637dbefb40ceef64
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 19:58:11 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:58:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92000a4a

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.26

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.4.2.ebuild | 162 ++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index ca44478..894685f 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
+DIST icinga2-2.4.2.tar.gz 1359694 SHA256 3f51f4aff2bc78d59051c442a5ab984a038e4396cf9f3835b91bd5eb327d353c SHA512 1be13d3e8492ba802e6b5b0e9ed1a54d9a722a35585df1f601761c5f1f33b2b4ac17d6b82ca8a34955b065d84f9b2d57e259809548958096ae1d6178c1903bf5 WHIRLPOOL 58a898f639073a2d20af062f338ce222ee94d247cac71abbfdc5191ae737c30764f9a064958c5ce044eb9829021e1513d9cd74548392d92a914f2c631a8b6932

diff --git a/net-analyzer/icinga2/icinga2-2.4.2.ebuild b/net-analyzer/icinga2/icinga2-2.4.2.ebuild
new file mode 100644
index 0000000..3902285
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
+
+CDEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-02-24 16:38 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-02-24 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     be76bf5e68d4752f5a7c9c07b2c4dbc48ee5e0de
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 16:38:24 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 16:38:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be76bf5e

net-analyzer/icinga2: another bup

Package-Manager: portage-2.2.26

 net-analyzer/icinga2/Manifest                                       | 2 +-
 net-analyzer/icinga2/{icinga2-2.4.2.ebuild => icinga2-2.4.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 894685f..08406bd 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,3 @@
 DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
-DIST icinga2-2.4.2.tar.gz 1359694 SHA256 3f51f4aff2bc78d59051c442a5ab984a038e4396cf9f3835b91bd5eb327d353c SHA512 1be13d3e8492ba802e6b5b0e9ed1a54d9a722a35585df1f601761c5f1f33b2b4ac17d6b82ca8a34955b065d84f9b2d57e259809548958096ae1d6178c1903bf5 WHIRLPOOL 58a898f639073a2d20af062f338ce222ee94d247cac71abbfdc5191ae737c30764f9a064958c5ce044eb9829021e1513d9cd74548392d92a914f2c631a8b6932
+DIST icinga2-2.4.3.tar.gz 1359833 SHA256 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6 SHA512 bc3efac97c97d8cfaa936749c8987a50dc484595f509fc31a2caf620748a7e01da79a972920f51a57cb2823741ef1cab52d3be6351aea67f2f57a9d6e1475ad6 WHIRLPOOL 46753433c2fd3b38712cae01b8065759fb3f339b89759ee93ae9ff276136c3a29988d75dce76ee783f2fb44970330858be25978ad99703351f630fe0375cb675

diff --git a/net-analyzer/icinga2/icinga2-2.4.2.ebuild b/net-analyzer/icinga2/icinga2-2.4.3.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.4.2.ebuild
rename to net-analyzer/icinga2/icinga2-2.4.3.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-03-16 16:33 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-03-16 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a1581b62cb425b28bc4bb893e999fa7f6467e699
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 16:32:56 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 16:32:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1581b62

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.26

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.4.4.ebuild | 162 ++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 08406bd..19bc400 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.3.tar.gz 1359833 SHA256 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6 SHA512 bc3efac97c97d8cfaa936749c8987a50dc484595f509fc31a2caf620748a7e01da79a972920f51a57cb2823741ef1cab52d3be6351aea67f2f57a9d6e1475ad6 WHIRLPOOL 46753433c2fd3b38712cae01b8065759fb3f339b89759ee93ae9ff276136c3a29988d75dce76ee783f2fb44970330858be25978ad99703351f630fe0375cb675
+DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050

diff --git a/net-analyzer/icinga2/icinga2-2.4.4.ebuild b/net-analyzer/icinga2/icinga2-2.4.4.ebuild
new file mode 100644
index 0000000..3902285
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.4.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
+
+CDEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-03-17 20:45 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-03-17 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9f9eeeda639d83961b42c9ba36c0d560ed88b87e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 20:43:03 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 20:45:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9eeeda

net-analyzer/icinga2: fixing fowners

Package-Manager: portage-2.2.26

 .../icinga2/{icinga2-9999.ebuild => icinga2-2.4.4-r1.ebuild}     | 9 ++++-----
 net-analyzer/icinga2/icinga2-9999.ebuild                         | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
similarity index 94%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
index c0f5d91..ee6c00c 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
@@ -3,16 +3,15 @@
 # $Id$
 
 EAPI=5
-inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
 HOMEPAGE="http://icinga.org/icinga2"
-EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-EGIT_BRANCH="master"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="
@@ -136,7 +135,7 @@ src_install() {
 	fowners icinga:icinga /etc/icinga2
 	fowners icinga:icinga /var/lib/icinga2
 	fowners icinga:icinga /var/spool/icinga2
-	fowners icinga:icingacmd /var/lib/icinga2/api
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
 	fowners icinga:icinga /var/spool/icinga2/perfdata
 	fowners icinga:icingacmd /var/log/icinga2
 

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index c0f5d91..4cdc77d 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -136,7 +136,7 @@ src_install() {
 	fowners icinga:icinga /etc/icinga2
 	fowners icinga:icinga /var/lib/icinga2
 	fowners icinga:icinga /var/spool/icinga2
-	fowners icinga:icingacmd /var/lib/icinga2/api
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
 	fowners icinga:icinga /var/spool/icinga2/perfdata
 	fowners icinga:icingacmd /var/log/icinga2
 


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-03-18 12:50 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-03-18 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     d09129c0dc628b3af6437085d392399a843855b6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 12:49:55 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 12:49:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09129c0

net-analyzer/icinga2: add arm keyword

Package-Manager: portage-2.2.26

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
index ee6c00c..9cba7d7 100644
--- a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-03-26 18:06 Agostino Sarubbo
  0 siblings, 0 replies; 176+ messages in thread
From: Agostino Sarubbo @ 2016-03-26 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     ec326920ae0c0ca8ab38e87409f9d520e03456aa
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 18:06:13 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 18:06:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec326920

net-analyzer/icinga2: amd64 stable wrt bug #578092

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
index 9cba7d7..c3fe2ba 100644
--- a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-04-20 15:54 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-04-20 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     ca5a1dcf1a2c3c5606d651f32a8703157f1cb1e0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 15:53:33 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 15:53:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5a1dcf

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.26

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.4.5.ebuild | 162 ++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 19bc400..f23cfab 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,3 +2,4 @@ DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.3.tar.gz 1359833 SHA256 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6 SHA512 bc3efac97c97d8cfaa936749c8987a50dc484595f509fc31a2caf620748a7e01da79a972920f51a57cb2823741ef1cab52d3be6351aea67f2f57a9d6e1475ad6 WHIRLPOOL 46753433c2fd3b38712cae01b8065759fb3f339b89759ee93ae9ff276136c3a29988d75dce76ee783f2fb44970330858be25978ad99703351f630fe0375cb675
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
+DIST icinga2-2.4.5.tar.gz 1762764 SHA256 2ce1368d12132129c9e7ffb6171cb3ab0589639e0768c6b2925ce74fc2aca100 SHA512 6b9205a56a10a8ca51fd0a3ff34cfb7931736f0fbcd931dd88471c8a7e596781b9b48bb111f6e6cd70e9ea92beedace033da71db76f5e3decb237d0e5503c056 WHIRLPOOL 9db7e9656de16ae59b9a798248277ab8a74dc5669d8f9959bc253973ac61948d28a3a0ce101cfafa22128a90cf81281d651628276afbecb80877a4f4370828dc

diff --git a/net-analyzer/icinga2/icinga2-2.4.5.ebuild b/net-analyzer/icinga2/icinga2-2.4.5.ebuild
new file mode 100644
index 0000000..9cba7d7
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.5.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
+
+CDEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# 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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-04-20 18:28 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-04-20 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     4b69485c88fadf116ce16d95ed06d45408095e15
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 18:27:03 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 18:27:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b69485c

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.26

 net-analyzer/icinga2/Manifest                                       | 2 +-
 net-analyzer/icinga2/{icinga2-2.4.5.ebuild => icinga2-2.4.6.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index f23cfab..d8026e4 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,4 +2,4 @@ DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.3.tar.gz 1359833 SHA256 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6 SHA512 bc3efac97c97d8cfaa936749c8987a50dc484595f509fc31a2caf620748a7e01da79a972920f51a57cb2823741ef1cab52d3be6351aea67f2f57a9d6e1475ad6 WHIRLPOOL 46753433c2fd3b38712cae01b8065759fb3f339b89759ee93ae9ff276136c3a29988d75dce76ee783f2fb44970330858be25978ad99703351f630fe0375cb675
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
-DIST icinga2-2.4.5.tar.gz 1762764 SHA256 2ce1368d12132129c9e7ffb6171cb3ab0589639e0768c6b2925ce74fc2aca100 SHA512 6b9205a56a10a8ca51fd0a3ff34cfb7931736f0fbcd931dd88471c8a7e596781b9b48bb111f6e6cd70e9ea92beedace033da71db76f5e3decb237d0e5503c056 WHIRLPOOL 9db7e9656de16ae59b9a798248277ab8a74dc5669d8f9959bc253973ac61948d28a3a0ce101cfafa22128a90cf81281d651628276afbecb80877a4f4370828dc
+DIST icinga2-2.4.6.tar.gz 1762846 SHA256 b99537e1a49b9496c93d2f696ef6c5f47a370ebadbe1cfcea57cc246ddc66fee SHA512 c4ebf240852b00a38d64a23d7248236788aed45ad55e6006b2e7b7bac7a989f28533cd9c86f8d3e43b1b210dc2b090355267fd9ec5602629848bc5c437098032 WHIRLPOOL 6c516b252383c22d2ee7ea31641b377713df01110a651f16083bbf5d03098cada825fe26897b9fe0c67752d9398c8cca5ba80ef6b7d06b60abd5f1a12159e7f8

diff --git a/net-analyzer/icinga2/icinga2-2.4.5.ebuild b/net-analyzer/icinga2/icinga2-2.4.6.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.4.5.ebuild
rename to net-analyzer/icinga2/icinga2-2.4.6.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-04-21 14:43 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-04-21 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     126be72bed21f48d70247aacf8ff29eba7cb6abf
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 14:42:22 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 14:43:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126be72b

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.26

 net-analyzer/icinga2/Manifest                                       | 2 +-
 net-analyzer/icinga2/{icinga2-2.4.6.ebuild => icinga2-2.4.7.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index d8026e4..6fb2169 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,4 +2,4 @@ DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.3.tar.gz 1359833 SHA256 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6 SHA512 bc3efac97c97d8cfaa936749c8987a50dc484595f509fc31a2caf620748a7e01da79a972920f51a57cb2823741ef1cab52d3be6351aea67f2f57a9d6e1475ad6 WHIRLPOOL 46753433c2fd3b38712cae01b8065759fb3f339b89759ee93ae9ff276136c3a29988d75dce76ee783f2fb44970330858be25978ad99703351f630fe0375cb675
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
-DIST icinga2-2.4.6.tar.gz 1762846 SHA256 b99537e1a49b9496c93d2f696ef6c5f47a370ebadbe1cfcea57cc246ddc66fee SHA512 c4ebf240852b00a38d64a23d7248236788aed45ad55e6006b2e7b7bac7a989f28533cd9c86f8d3e43b1b210dc2b090355267fd9ec5602629848bc5c437098032 WHIRLPOOL 6c516b252383c22d2ee7ea31641b377713df01110a651f16083bbf5d03098cada825fe26897b9fe0c67752d9398c8cca5ba80ef6b7d06b60abd5f1a12159e7f8
+DIST icinga2-2.4.7.tar.gz 1763118 SHA256 db00c3bf1be5b18a477953f39df467039521d4f00826951d5c6de43cef96acd9 SHA512 2674eca10af63d59d640d9e9c2af6dc22381669fc8defbf11b4cd388fa3b63fb838ee09fd98a3d6bff6816a108ed025fc113cce55e481497c714b7df8def9d2d WHIRLPOOL 48f76d61e6bcba2b3c25d84c36158cdef200b1df761f28d1bb80ae83f8a2ba70128287e9d291652e42db80d38924b10dc127fdea10d6b715e2225df51d5250d2

diff --git a/net-analyzer/icinga2/icinga2-2.4.6.ebuild b/net-analyzer/icinga2/icinga2-2.4.7.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.4.6.ebuild
rename to net-analyzer/icinga2/icinga2-2.4.7.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-04-30  3:06 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-04-30  3:06 UTC (permalink / raw
  To: gentoo-commits

commit:     95b9f8cdd2ac8485bd63326c38fc732a8a88c822
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 03:05:13 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 03:05:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b9f8cd

net-analyzer/icinga2: fix bug 580838

Package-Manager: portage-2.2.26

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.7.ebuild b/net-analyzer/icinga2/icinga2-2.4.7.ebuild
index 9cba7d7..8289a56 100644
--- a/net-analyzer/icinga2/icinga2-2.4.7.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.7.ebuild
@@ -157,6 +157,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+	elog "DB IDO schema upgrade could be required. See section 2.5.1 or 2.5.2 of "
+	elog "http://docs.icinga.org/icinga2/snapshot/chapter-2.html"
 }


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-04-30  3:08 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-04-30  3:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3071449adb9d6a7ec92e8662db2f08411b4e1356
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 03:07:53 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 03:07:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3071449a

net-analyzer/icinga2: better url

Package-Manager: portage-2.2.26

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

diff --git a/net-analyzer/icinga2/icinga2-2.4.7.ebuild b/net-analyzer/icinga2/icinga2-2.4.7.ebuild
index 8289a56..7569e8e 100644
--- a/net-analyzer/icinga2/icinga2-2.4.7.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.7.ebuild
@@ -157,6 +157,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "DB IDO schema upgrade could be required. See section 2.5.1 or 2.5.2 of "
-	elog "http://docs.icinga.org/icinga2/snapshot/chapter-2.html"
+	elog "DB IDO schema upgrade could be required. See the following for more information."
+	elog "http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
 }


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-05-19 17:05 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-05-19 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3f813d01ae5cb40e520e3812ccfa4a430b5eb1f6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 17:04:52 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu May 19 17:04:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f813d01

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.28

 net-analyzer/icinga2/Manifest                      |   4 +-
 net-analyzer/icinga2/icinga2-2.3.11.ebuild         | 133 -----------------
 ...{icinga2-2.4.7.ebuild => icinga2-2.4.10.ebuild} |   2 +-
 net-analyzer/icinga2/icinga2-2.4.3.ebuild          | 162 ---------------------
 net-analyzer/icinga2/icinga2-2.4.4.ebuild          | 162 ---------------------
 5 files changed, 2 insertions(+), 461 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 6fb2169..3388fb7 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,3 @@
-DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
-DIST icinga2-2.4.3.tar.gz 1359833 SHA256 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6 SHA512 bc3efac97c97d8cfaa936749c8987a50dc484595f509fc31a2caf620748a7e01da79a972920f51a57cb2823741ef1cab52d3be6351aea67f2f57a9d6e1475ad6 WHIRLPOOL 46753433c2fd3b38712cae01b8065759fb3f339b89759ee93ae9ff276136c3a29988d75dce76ee783f2fb44970330858be25978ad99703351f630fe0375cb675
+DIST icinga2-2.4.10.tar.gz 1768052 SHA256 c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e SHA512 de04d2236b05d33becad1b4e68a4b5ae553b43da9576f9b88f77a037800e6679840516777f32ce71680e81dd99feb850db8861ea2496b9acb1e0da9ce2ce3bd6 WHIRLPOOL 608fcd9caddc9aad5a5e36e9d6f6e0080fa61e6a640118d7aa269c5d435ebb9895d99067a875be50833fbaf7207f0ede058654b83e9f84706475da2813713e7c
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
-DIST icinga2-2.4.7.tar.gz 1763118 SHA256 db00c3bf1be5b18a477953f39df467039521d4f00826951d5c6de43cef96acd9 SHA512 2674eca10af63d59d640d9e9c2af6dc22381669fc8defbf11b4cd388fa3b63fb838ee09fd98a3d6bff6816a108ed025fc113cce55e481497c714b7df8def9d2d WHIRLPOOL 48f76d61e6bcba2b3c25d84c36158cdef200b1df761f28d1bb80ae83f8a2ba70128287e9d291652e42db80d38924b10dc127fdea10d6b715e2225df51d5250d2

diff --git a/net-analyzer/icinga2/icinga2-2.3.11.ebuild b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
deleted file mode 100644
index 8f31160..0000000
--- a/net-analyzer/icinga2/icinga2-2.3.11.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
-
-DEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( 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() {
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.4.7.ebuild b/net-analyzer/icinga2/icinga2-2.4.10.ebuild
similarity index 99%
rename from net-analyzer/icinga2/icinga2-2.4.7.ebuild
rename to net-analyzer/icinga2/icinga2-2.4.10.ebuild
index 7569e8e..3f6634a 100644
--- a/net-analyzer/icinga2/icinga2-2.4.7.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="

diff --git a/net-analyzer/icinga2/icinga2-2.4.3.ebuild b/net-analyzer/icinga2/icinga2-2.4.3.ebuild
deleted file mode 100644
index 3902285..0000000
--- a/net-analyzer/icinga2/icinga2-2.4.3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
-
-CDEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.4.4.ebuild b/net-analyzer/icinga2/icinga2-2.4.4.ebuild
deleted file mode 100644
index 3902285..0000000
--- a/net-analyzer/icinga2/icinga2-2.4.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
-
-CDEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-07-13 17:36 Anthony G. Basile
  0 siblings, 0 replies; 176+ messages in thread
From: Anthony G. Basile @ 2016-07-13 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6a49d00a91ef61395b566c5c453d0ad5bda57f4a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 17:37:41 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 17:37:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a49d00a

net-analyzer/icinga2: add libressl support

Package-Manager: portage-2.2.28

 net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild | 5 +++--
 net-analyzer/icinga2/icinga2-9999.ebuild      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild
index 2944374..a1a287f 100644
--- a/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild
@@ -12,10 +12,11 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="
-	dev-libs/openssl:0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	>=dev-libs/boost-1.41
 	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 4cdc77d..533f3a9 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -13,10 +13,11 @@ EGIT_BRANCH="master"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="
-	dev-libs/openssl:0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	>=dev-libs/boost-1.41
 	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-08-23 22:58 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-08-23 22:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c59776a26d6221a42cf7acc7a475a10e354ef0ad
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 22:57:52 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 22:57:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59776a2

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.28

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.5.1.ebuild | 164 ++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 3388fb7..1ce92e9 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.10.tar.gz 1768052 SHA256 c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e SHA512 de04d2236b05d33becad1b4e68a4b5ae553b43da9576f9b88f77a037800e6679840516777f32ce71680e81dd99feb850db8861ea2496b9acb1e0da9ce2ce3bd6 WHIRLPOOL 608fcd9caddc9aad5a5e36e9d6f6e0080fa61e6a640118d7aa269c5d435ebb9895d99067a875be50833fbaf7207f0ede058654b83e9f84706475da2813713e7c
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
+DIST icinga2-2.5.1.tar.gz 2493564 SHA256 6bf606136e5d0304bb422b520f0483a37c514fa09805f6f1abea8ab99b4d121d SHA512 d1458eee9bb86a7aed5a2fdbc555e7c0a2918c5f0abb2bf757e40cc61697177a6f3a84c24eeb0910f51be8ea7b99acd3c0c7b4abf50c0e751e4137e84f178630 WHIRLPOOL 9a5d430997d1c74d31b91a0d7a84330eeaa6ab71ec9b3eadd9b98dfa6c2f86feab56389b444e54413d10116f388ffd087f0a0ff8abcda27d5dde1b306f23ea74

diff --git a/net-analyzer/icinga2/icinga2-2.5.1.ebuild b/net-analyzer/icinga2/icinga2-2.5.1.ebuild
new file mode 100644
index 00000000..0b3ce39
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.5.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.41
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-08-24 13:11 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-08-24 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     0222a1b4b37482532ee1c61062d98579699bee9a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 13:10:06 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 13:11:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0222a1b4

net-analyzer/icinga2: fixing postinst message and keywording 2.5.1

Package-Manager: portage-2.2.28

 net-analyzer/icinga2/icinga2-2.5.1.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.5.1.ebuild b/net-analyzer/icinga2/icinga2-2.5.1.ebuild
index 0b3ce39..b530bfc 100644
--- a/net-analyzer/icinga2/icinga2-2.5.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="
@@ -159,6 +159,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
 }


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-08-24 22:22 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-08-24 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     531341b6e157fc8cd09acfa9fd17a6d420db102f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 22:22:29 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 22:22:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531341b6

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.28

 net-analyzer/icinga2/Manifest                                       | 2 +-
 net-analyzer/icinga2/{icinga2-2.5.1.ebuild => icinga2-2.5.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 1ce92e9..78f46e9 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,4 @@
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.10.tar.gz 1768052 SHA256 c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e SHA512 de04d2236b05d33becad1b4e68a4b5ae553b43da9576f9b88f77a037800e6679840516777f32ce71680e81dd99feb850db8861ea2496b9acb1e0da9ce2ce3bd6 WHIRLPOOL 608fcd9caddc9aad5a5e36e9d6f6e0080fa61e6a640118d7aa269c5d435ebb9895d99067a875be50833fbaf7207f0ede058654b83e9f84706475da2813713e7c
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
-DIST icinga2-2.5.1.tar.gz 2493564 SHA256 6bf606136e5d0304bb422b520f0483a37c514fa09805f6f1abea8ab99b4d121d SHA512 d1458eee9bb86a7aed5a2fdbc555e7c0a2918c5f0abb2bf757e40cc61697177a6f3a84c24eeb0910f51be8ea7b99acd3c0c7b4abf50c0e751e4137e84f178630 WHIRLPOOL 9a5d430997d1c74d31b91a0d7a84330eeaa6ab71ec9b3eadd9b98dfa6c2f86feab56389b444e54413d10116f388ffd087f0a0ff8abcda27d5dde1b306f23ea74
+DIST icinga2-2.5.2.tar.gz 2493587 SHA256 b0da3f4629494b3b775b6f1ec25ceb59c497f6bfaeae57357065084ba1609753 SHA512 080f5a935d5ecb763c37636b23ce81d5cbd77650a713371b14737264ded448746871e0662817951a3ef751ae2ddc728f1cf5defa1b97bdcf2cde1ee3e449b14f WHIRLPOOL 51791f7dc9789e41a3acc90c3c0d4b18425fcea771715fa8975b1c739bf2dcc9df72eeb7e8c13944b680a4659e3f5b418242bd60b4639d03bcf6e132b214270a

diff --git a/net-analyzer/icinga2/icinga2-2.5.1.ebuild b/net-analyzer/icinga2/icinga2-2.5.2.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.5.1.ebuild
rename to net-analyzer/icinga2/icinga2-2.5.2.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-08-25 14:40 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-08-25 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5a5d76e13e76cd1b65ae3cf85398dc2c867c599d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 14:40:11 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 14:40:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5d76e1

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.28

 net-analyzer/icinga2/Manifest                                       | 2 +-
 net-analyzer/icinga2/{icinga2-2.5.2.ebuild => icinga2-2.5.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 78f46e9..cfdf97d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,4 @@
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.10.tar.gz 1768052 SHA256 c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e SHA512 de04d2236b05d33becad1b4e68a4b5ae553b43da9576f9b88f77a037800e6679840516777f32ce71680e81dd99feb850db8861ea2496b9acb1e0da9ce2ce3bd6 WHIRLPOOL 608fcd9caddc9aad5a5e36e9d6f6e0080fa61e6a640118d7aa269c5d435ebb9895d99067a875be50833fbaf7207f0ede058654b83e9f84706475da2813713e7c
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
-DIST icinga2-2.5.2.tar.gz 2493587 SHA256 b0da3f4629494b3b775b6f1ec25ceb59c497f6bfaeae57357065084ba1609753 SHA512 080f5a935d5ecb763c37636b23ce81d5cbd77650a713371b14737264ded448746871e0662817951a3ef751ae2ddc728f1cf5defa1b97bdcf2cde1ee3e449b14f WHIRLPOOL 51791f7dc9789e41a3acc90c3c0d4b18425fcea771715fa8975b1c739bf2dcc9df72eeb7e8c13944b680a4659e3f5b418242bd60b4639d03bcf6e132b214270a
+DIST icinga2-2.5.3.tar.gz 2493793 SHA256 3d3b783766b31bacb161fd87218c25562125a94a890ec53c3fb554633ecc7748 SHA512 f602032c527f92134941b918941c64913972182be6aa838341d58279c2a2ba1ae56c4d2da1c9b5191023ab2082589505b5544fb85fcaa3c1ee02f92c5f73ea01 WHIRLPOOL 63c8b8c93ba5c68878a9a45b56b5b6e667d7f42784646bde3e2d1c722138072bcf439a52fd7c933d56fbd30bdf3c62e88a892611c52cbf76e1758ee4ca91985c

diff --git a/net-analyzer/icinga2/icinga2-2.5.2.ebuild b/net-analyzer/icinga2/icinga2-2.5.3.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.5.2.ebuild
rename to net-analyzer/icinga2/icinga2-2.5.3.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-08-31 13:00 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-08-31 13:00 UTC (permalink / raw
  To: gentoo-commits

commit:     46ef2feabc6afc01737f0305ce89a8908730f102
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 13:00:00 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 13:00:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ef2fea

net-analyzer/icinga2: bup

Package-Manager: portage-2.2.28

 net-analyzer/icinga2/Manifest                                       | 2 +-
 net-analyzer/icinga2/{icinga2-2.5.3.ebuild => icinga2-2.5.4.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index cfdf97d..bcdd96d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,4 @@
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
 DIST icinga2-2.4.10.tar.gz 1768052 SHA256 c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e SHA512 de04d2236b05d33becad1b4e68a4b5ae553b43da9576f9b88f77a037800e6679840516777f32ce71680e81dd99feb850db8861ea2496b9acb1e0da9ce2ce3bd6 WHIRLPOOL 608fcd9caddc9aad5a5e36e9d6f6e0080fa61e6a640118d7aa269c5d435ebb9895d99067a875be50833fbaf7207f0ede058654b83e9f84706475da2813713e7c
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
-DIST icinga2-2.5.3.tar.gz 2493793 SHA256 3d3b783766b31bacb161fd87218c25562125a94a890ec53c3fb554633ecc7748 SHA512 f602032c527f92134941b918941c64913972182be6aa838341d58279c2a2ba1ae56c4d2da1c9b5191023ab2082589505b5544fb85fcaa3c1ee02f92c5f73ea01 WHIRLPOOL 63c8b8c93ba5c68878a9a45b56b5b6e667d7f42784646bde3e2d1c722138072bcf439a52fd7c933d56fbd30bdf3c62e88a892611c52cbf76e1758ee4ca91985c
+DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd

diff --git a/net-analyzer/icinga2/icinga2-2.5.3.ebuild b/net-analyzer/icinga2/icinga2-2.5.4.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.5.3.ebuild
rename to net-analyzer/icinga2/icinga2-2.5.4.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-09-25 16:11 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-09-25 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     e842e399961f077e6e85c9d2a955c17fc5abb35c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 16:01:53 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 16:01:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e842e399

net-analyzer/icinga2: stable amd64 and x86

Package-Manager: portage-2.2.28

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

diff --git a/net-analyzer/icinga2/icinga2-2.5.4.ebuild b/net-analyzer/icinga2/icinga2-2.5.4.ebuild
index b530bfc..7789098 100644
--- a/net-analyzer/icinga2/icinga2-2.5.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-11-23 23:35 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-11-23 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     3e3c5ce1fcbf587b12064aeb755ba7b86d83d2ee
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 23:34:35 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 23:34:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e3c5ce1

net-analyzer/icinga2: bup

Package-Manager: portage-2.3.0

 net-analyzer/icinga2/Manifest                 |   2 -
 net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild  | 162 -------------------------
 net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild | 165 --------------------------
 net-analyzer/icinga2/icinga2-9999.ebuild      |  25 ++--
 4 files changed, 18 insertions(+), 336 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bcdd96d..047e607 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,2 @@
-DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
-DIST icinga2-2.4.10.tar.gz 1768052 SHA256 c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e SHA512 de04d2236b05d33becad1b4e68a4b5ae553b43da9576f9b88f77a037800e6679840516777f32ce71680e81dd99feb850db8861ea2496b9acb1e0da9ce2ce3bd6 WHIRLPOOL 608fcd9caddc9aad5a5e36e9d6f6e0080fa61e6a640118d7aa269c5d435ebb9895d99067a875be50833fbaf7207f0ede058654b83e9f84706475da2813713e7c
 DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd

diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
deleted file mode 100644
index d628f39..00000000
--- a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
-
-CDEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild
deleted file mode 100644
index a1a287f..00000000
--- a/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.41
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-PATCHES=( "${FILESDIR}/logrotate.patch" )
-
-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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade could be required. See the following for more information."
-	elog "http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-}

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 533f3a9..e5ea649 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -3,17 +3,24 @@
 # $Id$
 
 EAPI=5
-inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user
+if [[ ${PV} != 9999 ]]; 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 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-2 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"
-EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-EGIT_BRANCH="master"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+WX_GTK_VER="3.0"
 
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -36,7 +43,7 @@ RDEPEND="
 	) )
 	mail? ( virtual/mailx )
 	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:2.9 )"
+	studio? ( x11-libs/wxGTK:3.0 )"
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
@@ -44,6 +51,7 @@ want_apache2
 
 pkg_setup() {
 	depend.apache_pkg_setup
+	setup-wxwidgets
 	enewgroup icinga
 	enewgroup icingacmd
 	enewgroup nagios  # for plugins
@@ -65,6 +73,7 @@ src_configure() {
 		-DICINGA2_COMMAND_USER=icinga
 		-DICINGA2_COMMAND_GROUP=icingacmd
 		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DLOGROTATE_HAS_SU=ON
 	)
 	# default to off if minimal, allow the flags to be set otherwise
 	if use minimal; then
@@ -159,6 +168,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
 }


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-11-24  0:59 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-11-24  0:59 UTC (permalink / raw
  To: gentoo-commits

commit:     05238cc3741639293d61ef5f99e0a313f23a30e6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 00:58:00 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 00:58:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05238cc3

net-analyzer/icinga2: bup with new wxgtk

Package-Manager: portage-2.3.0
RepoMan-Options: --force

 net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild | 175 +++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)

diff --git a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
new file mode 100644
index 00000000..e5ea649
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+if [[ ${PV} != 9999 ]]; 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 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-2 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.41
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	setup-wxwidgets
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-11-24  0:59 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-11-24  0:59 UTC (permalink / raw
  To: gentoo-commits

commit:     703ea5c8ab41b24a2a92a88b8757ae4b984cd398
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 00:58:45 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 00:58:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703ea5c8

net-analyzer/icinga2: stable the new wxgtk fix

Package-Manager: portage-2.3.0
RepoMan-Options: --force

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

diff --git a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
index e5ea649..f91b4c1 100644
--- a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 if [[ ${PV} != 9999 ]]; 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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-11-24  0:59 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-11-24  0:59 UTC (permalink / raw
  To: gentoo-commits

commit:     bf7ddfc8b0792bd66663e6b5ae551583b156396a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 00:59:11 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 00:59:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7ddfc8

net-analyzer/icinga2: cleanup to fix the tree

Package-Manager: portage-2.3.0

 net-analyzer/icinga2/Manifest                |   1 -
 net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild | 162 --------------------------
 net-analyzer/icinga2/icinga2-2.5.4.ebuild    | 166 ---------------------------
 3 files changed, 329 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 047e607..1e94b1b 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050
 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd

diff --git a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
deleted file mode 100644
index fcb0775..00000000
--- a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
-
-CDEPEND="
-	dev-libs/openssl:0
-	>=dev-libs/boost-1.41
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-	)
-	# 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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.5.4.ebuild b/net-analyzer/icinga2/icinga2-2.5.4.ebuild
deleted file mode 100644
index 7789098..00000000
--- a/net-analyzer/icinga2/icinga2-2.5.4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.41
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:2.9 )"
-
-REQUIRED_USE="!minimal? ( || ( 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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-11-27 20:03 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-11-27 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     ec7b713cd12835cce7a72284772180d106e56c41
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 20:02:19 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 20:02:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7b713c

net-analyzer/icinga2: fixing build issue with wxwidgets bug 600644

Package-Manager: portage-2.3.0

 net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild | 4 +++-
 net-analyzer/icinga2/icinga2-9999.ebuild     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
index f91b4c1..76f6f9a 100644
--- a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
@@ -51,7 +51,9 @@ want_apache2
 
 pkg_setup() {
 	depend.apache_pkg_setup
-	setup-wxwidgets
+	if use studio ; then
+		setup-wxwidgets
+	fi
 	enewgroup icinga
 	enewgroup icingacmd
 	enewgroup nagios  # for plugins

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index e5ea649..0ff7130 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -51,7 +51,9 @@ want_apache2
 
 pkg_setup() {
 	depend.apache_pkg_setup
-	setup-wxwidgets
+	if use studio ; then
+		setup-wxwidgets
+	fi
 	enewgroup icinga
 	enewgroup icingacmd
 	enewgroup nagios  # for plugins


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2016-12-13 16:14 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2016-12-13 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     bec3a6922bd9e71b4ea0383199c380302f89f9b0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 16:13:25 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 16:13:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec3a692

net-analyzer/icinga2: bup

Package-Manager: portage-2.3.0

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.6.0.ebuild | 177 ++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 1e94b1b..5b6a30b 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd
+DIST icinga2-2.6.0.tar.gz 2353930 SHA256 b04627d7508dda4bb7b75b74501586d34b5d3d8752291c56682ba1137af03270 SHA512 70b44b3072b20799f5efd39c3e6692b9ae84f3d85886fe072ab67b34a5e4c53f5b6a7f9238d9fbdc663a6491c8c22dd79c71ddc06fa70bd95d2cb737896b3a91 WHIRLPOOL 32fcf3b442183527d3934a38fb1d0bfba7c2bb6336eb335b6810060c11e8c85184fe7d21d67b6aa29edf4c33f996adc7d949c87cb9fe5ab08c8606beec209480

diff --git a/net-analyzer/icinga2/icinga2-2.6.0.ebuild b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
new file mode 100644
index 00000000..0ff7130
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+if [[ ${PV} != 9999 ]]; 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 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-2 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.41
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-01-06 22:53 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-01-06 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5adba06a410e2078354effac723413f0ece2d8a9
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 22:51:47 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 22:53:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5adba06a

updated dep so it'll actually build

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

diff --git a/net-analyzer/icinga2/icinga2-2.6.0.ebuild b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
index 0ff7130..c4d7662 100644
--- a/net-analyzer/icinga2/icinga2-2.6.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
@@ -25,7 +25,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.41
+	>=dev-libs/boost-1.58-r1
 	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-01-26 15:38 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-01-26 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     7d974328dd5bda31fe851b27eb1fa78ff48da257
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 15:37:52 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 15:37:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d974328

net-analyzer/icinga2: 2.6.0 stable amd64 and x86

Package-Manager: portage-2.3.3

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

diff --git a/net-analyzer/icinga2/icinga2-2.6.0.ebuild b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
index c4d7662..438efb4 100644
--- a/net-analyzer/icinga2/icinga2-2.6.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 if [[ ${PV} != 9999 ]]; 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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-01-31 15:45 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-01-31 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     81d23b5f38602d303786ba42776a2bea5287c230
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 15:44:25 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 15:44:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d23b5f

net-analyzer/icinga2: bup

Package-Manager: portage-2.3.3

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.6.1.ebuild | 177 ++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 5b6a30b..7ebbd40 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd
 DIST icinga2-2.6.0.tar.gz 2353930 SHA256 b04627d7508dda4bb7b75b74501586d34b5d3d8752291c56682ba1137af03270 SHA512 70b44b3072b20799f5efd39c3e6692b9ae84f3d85886fe072ab67b34a5e4c53f5b6a7f9238d9fbdc663a6491c8c22dd79c71ddc06fa70bd95d2cb737896b3a91 WHIRLPOOL 32fcf3b442183527d3934a38fb1d0bfba7c2bb6336eb335b6810060c11e8c85184fe7d21d67b6aa29edf4c33f996adc7d949c87cb9fe5ab08c8606beec209480
+DIST icinga2-2.6.1.tar.gz 2357267 SHA256 783d35c7fcd1b8fa7914633dc376dfad864ccd648b773bb5ef61bb2a1e86b425 SHA512 7882fb5d4360e00f97329052f41e98f55386312e835292b2e0f736b34db14c1d0290722d09a6bd4b29b16d2b54ce3d8f9974018559e73e42ead3e70f64d36af8 WHIRLPOOL 2976812686be60fade1f381dc16e93307d9690e95bd1dd1009a060d733d795b4de9fcccf565254bd461772d4fa72b9a83d2cc9cbc869f14d66fc6d5a74fd5a0a

diff --git a/net-analyzer/icinga2/icinga2-2.6.1.ebuild b/net-analyzer/icinga2/icinga2-2.6.1.ebuild
new file mode 100644
index 00000000..b796077
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.6.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+if [[ ${PV} != 9999 ]]; 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 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-2 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-02-13 15:51 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-02-13 15:51 UTC (permalink / raw
  To: gentoo-commits

commit:     902bc32fc09ff45d33073569b41212a08c885e44
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 15:50:54 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 15:51:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902bc32f

net-analyzer/icinga2: bup

Package-Manager: portage-2.3.3

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.6.2.ebuild | 177 ++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 7ebbd402b2..66c839af34 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd
 DIST icinga2-2.6.0.tar.gz 2353930 SHA256 b04627d7508dda4bb7b75b74501586d34b5d3d8752291c56682ba1137af03270 SHA512 70b44b3072b20799f5efd39c3e6692b9ae84f3d85886fe072ab67b34a5e4c53f5b6a7f9238d9fbdc663a6491c8c22dd79c71ddc06fa70bd95d2cb737896b3a91 WHIRLPOOL 32fcf3b442183527d3934a38fb1d0bfba7c2bb6336eb335b6810060c11e8c85184fe7d21d67b6aa29edf4c33f996adc7d949c87cb9fe5ab08c8606beec209480
 DIST icinga2-2.6.1.tar.gz 2357267 SHA256 783d35c7fcd1b8fa7914633dc376dfad864ccd648b773bb5ef61bb2a1e86b425 SHA512 7882fb5d4360e00f97329052f41e98f55386312e835292b2e0f736b34db14c1d0290722d09a6bd4b29b16d2b54ce3d8f9974018559e73e42ead3e70f64d36af8 WHIRLPOOL 2976812686be60fade1f381dc16e93307d9690e95bd1dd1009a060d733d795b4de9fcccf565254bd461772d4fa72b9a83d2cc9cbc869f14d66fc6d5a74fd5a0a
+DIST icinga2-2.6.2.tar.gz 2357220 SHA256 c2058c0e6c39860c52a57b8ce79224729f34b48bc96fb7b1ae2b742909e9b71b SHA512 733370fb120b79bbe3bdbf3d4b640083ff26d2a872c545f4efcd23be3462435f75e0b43b269b770296cb6de4a0529f2369fb766e06444d3fdb56f04db6a3dd03 WHIRLPOOL 0d28a429e5068a490a85ebced3b102780327519968f0cdc7eb3d939d91b6199ee285e0ca524d8596681b2c82832d8fc1909974f5f7e2ecbf0b7fe2ffc908327d

diff --git a/net-analyzer/icinga2/icinga2-2.6.2.ebuild b/net-analyzer/icinga2/icinga2-2.6.2.ebuild
new file mode 100644
index 0000000000..b796077987
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.6.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+if [[ ${PV} != 9999 ]]; 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 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-2 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 icinga2
+	newconfd "${FILESDIR}"/icinga2.confd 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-02-24 17:39 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-02-24 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     96e3c6b74a0faaf70b7ab0fc85a5b011563e4b99
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 17:27:50 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 17:27:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96e3c6b7

net-analyzer/icinga2: 2.6.2 stable amd64 and x86

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/net-analyzer/icinga2/icinga2-2.6.2.ebuild b/net-analyzer/icinga2/icinga2-2.6.2.ebuild
index b796077987..438efb4b47 100644
--- a/net-analyzer/icinga2/icinga2-2.6.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 if [[ ${PV} != 9999 ]]; 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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-03-29 18:08 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-03-29 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6b5a4d045a85ae13a0157de5b9e53048900a038b
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:07:23 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 18:08:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5a4d04

net-analyzer/icinga2: 2.6.3 bup

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/icinga2/Manifest                      |   3 +-
 net-analyzer/icinga2/icinga2-2.6.0.ebuild          | 176 ---------------------
 .../{icinga2-2.6.1.ebuild => icinga2-2.6.3.ebuild} |   0
 3 files changed, 1 insertion(+), 178 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 66c839af347..6a127b2873e 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd
-DIST icinga2-2.6.0.tar.gz 2353930 SHA256 b04627d7508dda4bb7b75b74501586d34b5d3d8752291c56682ba1137af03270 SHA512 70b44b3072b20799f5efd39c3e6692b9ae84f3d85886fe072ab67b34a5e4c53f5b6a7f9238d9fbdc663a6491c8c22dd79c71ddc06fa70bd95d2cb737896b3a91 WHIRLPOOL 32fcf3b442183527d3934a38fb1d0bfba7c2bb6336eb335b6810060c11e8c85184fe7d21d67b6aa29edf4c33f996adc7d949c87cb9fe5ab08c8606beec209480
-DIST icinga2-2.6.1.tar.gz 2357267 SHA256 783d35c7fcd1b8fa7914633dc376dfad864ccd648b773bb5ef61bb2a1e86b425 SHA512 7882fb5d4360e00f97329052f41e98f55386312e835292b2e0f736b34db14c1d0290722d09a6bd4b29b16d2b54ce3d8f9974018559e73e42ead3e70f64d36af8 WHIRLPOOL 2976812686be60fade1f381dc16e93307d9690e95bd1dd1009a060d733d795b4de9fcccf565254bd461772d4fa72b9a83d2cc9cbc869f14d66fc6d5a74fd5a0a
 DIST icinga2-2.6.2.tar.gz 2357220 SHA256 c2058c0e6c39860c52a57b8ce79224729f34b48bc96fb7b1ae2b742909e9b71b SHA512 733370fb120b79bbe3bdbf3d4b640083ff26d2a872c545f4efcd23be3462435f75e0b43b269b770296cb6de4a0529f2369fb766e06444d3fdb56f04db6a3dd03 WHIRLPOOL 0d28a429e5068a490a85ebced3b102780327519968f0cdc7eb3d939d91b6199ee285e0ca524d8596681b2c82832d8fc1909974f5f7e2ecbf0b7fe2ffc908327d
+DIST icinga2-2.6.3.tar.gz 2360602 SHA256 83d44871a70d1b368b1af717873ff9b1b185344d23fc79b83118e47a85da6d90 SHA512 c6512411689951611b19a5e80bf360b4cf5ddbf95dcb47cb393f90798e36c052c68b79a5a33a72cd6205ab58d4bb3ac44ec4cd82f9d1d17dc3c0e550723272b3 WHIRLPOOL 9e2c116be306cce35d780387cd2487a7a33b5819166308b83bb26d17cb856094f67d80ea110370b13e7fa19d84463b73da1a65fbf0de60663f2ad53e25c19108

diff --git a/net-analyzer/icinga2/icinga2-2.6.0.ebuild b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
deleted file mode 100644
index 36d3970dc4e..00000000000
--- a/net-analyzer/icinga2/icinga2-2.6.0.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-if [[ ${PV} != 9999 ]]; 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 x86"
-else
-	inherit cmake-utils depend.apache eutils git-2 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:3.0 )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.6.1.ebuild b/net-analyzer/icinga2/icinga2-2.6.3.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.6.1.ebuild
rename to net-analyzer/icinga2/icinga2-2.6.3.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-04-28 17:00 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-04-28 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     f8f3992bb2d0f03b24b57d9d04083ad9a8b76d5d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 16:49:27 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 16:59:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f3992b

net-analyzer/icinga2: 2.6.3 stable amd64 and x86

Package-Manager: Portage-2.3.3, Repoman-2.3.2

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

diff --git a/net-analyzer/icinga2/icinga2-2.6.3.ebuild b/net-analyzer/icinga2/icinga2-2.6.3.ebuild
index 0b04670293a..36d3970dc4e 100644
--- a/net-analyzer/icinga2/icinga2-2.6.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 if [[ ${PV} != 9999 ]]; 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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-05-16 22:05 Michael Weber
  0 siblings, 0 replies; 176+ messages in thread
From: Michael Weber @ 2017-05-16 22:05 UTC (permalink / raw
  To: gentoo-commits

commit:     6ea6d1530b50e6c2fa8585ec2d62bd4759bc8754
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 22:04:22 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May 16 22:04:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea6d153

net-analyzer/icinga2: add ~ppc ~ppc64 keywords (bug 605724).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc ppc64"

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

diff --git a/net-analyzer/icinga2/icinga2-2.6.3.ebuild b/net-analyzer/icinga2/icinga2-2.6.3.ebuild
index 36d3970dc4e..263b8155066 100644
--- a/net-analyzer/icinga2/icinga2-2.6.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.3.ebuild
@@ -5,12 +5,12 @@ EAPI=5
 if [[ ${PV} != 9999 ]]; 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 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
 	EGIT_BRANCH="master"
-	KEYWORDS=""
+	KEYWORDS="~ppc ~ppc64"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-07-24  1:57 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-07-24  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     6045601c571bba809b75d0bc0da396eb775c2d84
Author:     Ewoud Kohl van Wijngaarden <ewoud <AT> kohlvanwijngaarden <DOT> nl>
AuthorDate: Sat Jul  1 12:44:21 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 01:56:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6045601c

net-analyzer/icinga2: Use upstream sysconfig

Upstream ships a sysconfig file that's installed to /etc/conf.d/icinga2 but the
newconfd writes an incomplete version that breaks the prepare-dirs command.

Gentoo-Bug: 589930

Package-Manager: Portage-2.3.6, Repoman-2.3.1
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/icinga2-2.6.3.ebuild b/net-analyzer/icinga2/icinga2-2.6.3.ebuild
index 263b8155066..5f0227d0451 100644
--- a/net-analyzer/icinga2/icinga2-2.6.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.3.ebuild
@@ -121,7 +121,6 @@ src_install() {
 	einstalldocs
 
 	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
 
 	if use mysql ; then
 		docinto schema


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-07-24  2:03 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-07-24  2:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7425615d1f16a8da048f23d6f3087a87820be2e4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 02:03:39 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 02:03:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7425615d

net-analyzer/icinga2: forgot to revbump...

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --force

 net-analyzer/icinga2/{icinga2-2.6.3.ebuild => icinga2-2.6.3-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

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


^ permalink raw reply	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-08-02 18:52 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-08-02 18:52 UTC (permalink / raw
  To: gentoo-commits

commit:     df2cb28bfcd4cd22dcf85b9a23a85ca4c74700c0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  2 18:49:11 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 18:52:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2cb28b

net-analyzer/icinga2: 2.7.0 bup

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.7.0.ebuild | 175 ++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 6a127b2873e..40628adac7d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd
 DIST icinga2-2.6.2.tar.gz 2357220 SHA256 c2058c0e6c39860c52a57b8ce79224729f34b48bc96fb7b1ae2b742909e9b71b SHA512 733370fb120b79bbe3bdbf3d4b640083ff26d2a872c545f4efcd23be3462435f75e0b43b269b770296cb6de4a0529f2369fb766e06444d3fdb56f04db6a3dd03 WHIRLPOOL 0d28a429e5068a490a85ebced3b102780327519968f0cdc7eb3d939d91b6199ee285e0ca524d8596681b2c82832d8fc1909974f5f7e2ecbf0b7fe2ffc908327d
 DIST icinga2-2.6.3.tar.gz 2360602 SHA256 83d44871a70d1b368b1af717873ff9b1b185344d23fc79b83118e47a85da6d90 SHA512 c6512411689951611b19a5e80bf360b4cf5ddbf95dcb47cb393f90798e36c052c68b79a5a33a72cd6205ab58d4bb3ac44ec4cd82f9d1d17dc3c0e550723272b3 WHIRLPOOL 9e2c116be306cce35d780387cd2487a7a33b5819166308b83bb26d17cb856094f67d80ea110370b13e7fa19d84463b73da1a65fbf0de60663f2ad53e25c19108
+DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47

diff --git a/net-analyzer/icinga2/icinga2-2.7.0.ebuild b/net-analyzer/icinga2/icinga2-2.7.0.ebuild
new file mode 100644
index 00000000000..9c30b14ad3e
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.7.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+if [[ ${PV} != 9999 ]]; 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-2 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS="~ppc ~ppc64"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 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/*
+	elif 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}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-08-04 19:31 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-08-04 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     09e29b80aa47ecc741b5ba1df06a4b54b34ad295
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  4 19:30:45 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Aug  4 19:31:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e29b80

net-analyzer/icinga2: 2.7.0 fix multilib=strict builds

Package-Manager: Portage-2.3.6, Repoman-2.3.3

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

diff --git a/net-analyzer/icinga2/icinga2-2.7.0.ebuild b/net-analyzer/icinga2/icinga2-2.7.0.ebuild
index 9c30b14ad3e..91fbbba6115 100644
--- a/net-analyzer/icinga2/icinga2-2.7.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.7.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 if [[ ${PV} != 9999 ]]; 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"
@@ -69,6 +69,7 @@ src_configure() {
 		-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_USER=icinga


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-08-28  2:11 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-08-28  2:11 UTC (permalink / raw
  To: gentoo-commits

commit:     d9276430ea2cef1875829bccaf60761eb5b00bb3
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 02:10:14 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 02:11:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9276430

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

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/icinga2/Manifest                |   1 -
 net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild | 176 ---------------------------
 net-analyzer/icinga2/icinga2-2.7.0.ebuild    |   2 +-
 3 files changed, 1 insertion(+), 178 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 40628adac7d..e51208d8bbc 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd
 DIST icinga2-2.6.2.tar.gz 2357220 SHA256 c2058c0e6c39860c52a57b8ce79224729f34b48bc96fb7b1ae2b742909e9b71b SHA512 733370fb120b79bbe3bdbf3d4b640083ff26d2a872c545f4efcd23be3462435f75e0b43b269b770296cb6de4a0529f2369fb766e06444d3fdb56f04db6a3dd03 WHIRLPOOL 0d28a429e5068a490a85ebced3b102780327519968f0cdc7eb3d939d91b6199ee285e0ca524d8596681b2c82832d8fc1909974f5f7e2ecbf0b7fe2ffc908327d
 DIST icinga2-2.6.3.tar.gz 2360602 SHA256 83d44871a70d1b368b1af717873ff9b1b185344d23fc79b83118e47a85da6d90 SHA512 c6512411689951611b19a5e80bf360b4cf5ddbf95dcb47cb393f90798e36c052c68b79a5a33a72cd6205ab58d4bb3ac44ec4cd82f9d1d17dc3c0e550723272b3 WHIRLPOOL 9e2c116be306cce35d780387cd2487a7a33b5819166308b83bb26d17cb856094f67d80ea110370b13e7fa19d84463b73da1a65fbf0de60663f2ad53e25c19108
 DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47

diff --git a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
deleted file mode 100644
index 12bfa48676c..00000000000
--- a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-if [[ ${PV} != 9999 ]]; 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 x86"
-else
-	inherit cmake-utils depend.apache eutils git-2 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.41
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:3.0 )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
-	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_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 icinga2
-	newconfd "${FILESDIR}"/icinga2.confd 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/*
-	elif 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}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners icinga:icinga /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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.7.0.ebuild b/net-analyzer/icinga2/icinga2-2.7.0.ebuild
index 91fbbba6115..35df65d8c19 100644
--- a/net-analyzer/icinga2/icinga2-2.7.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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-2 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-09-21 16:28 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-09-21 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     5fab84e3ddf71b05e626423029d47b4db833882c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 21 16:24:38 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 16:27:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fab84e3

net-analyzer/icinga2: 2.7.1 bup

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/icinga2/Manifest                                     | 1 +
 .../icinga2/{icinga2-9999.ebuild => icinga2-2.7.1.ebuild}         | 8 ++++----
 net-analyzer/icinga2/icinga2-9999.ebuild                          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 3f3288ae022..c19fb18d6f1 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
+DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-2.7.1.ebuild
similarity index 96%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.7.1.ebuild
index 644d451cfc6..875027fb0d7 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.7.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 if [[ ${PV} != 9999 ]]; 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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 else
-	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
+	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=""
+	KEYWORDS="~ppc ~ppc64"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 644d451cfc6..32561101621 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
+	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=""


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-10-17  1:42 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-10-17  1:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ef306e23921bf0fe6018eefd2ab9d152590fb6fd
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 01:40:46 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 01:40:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef306e23

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

Package-Manager: Portage-2.3.8, Repoman-2.3.3

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

diff --git a/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
index 2f4dc84145d..4bd4eebcedb 100644
--- a/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-11-12 15:28 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-11-12 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     999b0b5b23047dac16c616f05d747286edd51f06
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 15:27:56 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 15:27:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=999b0b5b

net-analyzer/icinga2: 2.7.2 bup

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.7.2.ebuild | 182 ++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index c19fb18d6f1..090e7392568 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
 DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785
+DIST icinga2-2.7.2.tar.gz 2471098 SHA256 7e9691ad3389f04a53042d88c1ac8a37e2c9aaf8287856cad3fa48825adaee84 SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d WHIRLPOOL 55e55189b9a1f6646cb94748a7b22731cd5f0d576a858737530187bbab83f40c8973f1a9f508449b0dcb997af443e75a15c9b2ef775c8fe95d1740c72db214c9

diff --git a/net-analyzer/icinga2/icinga2-2.7.2.ebuild b/net-analyzer/icinga2/icinga2-2.7.2.ebuild
new file mode 100644
index 00000000000..2f4dc84145d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.7.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; 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="~ppc ~ppc64"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+PATCHES=(
+	"${FILESDIR}/fix-missing-include-2.7.1.patch"
+	"${FILESDIR}/fix-missing-include-2.7.1-2.patch"
+)
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 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/*
+	elif 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-11-17  3:31 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-11-17  3:31 UTC (permalink / raw
  To: gentoo-commits

commit:     4bf1a62e845340a27027e4ee9cafddd7099ff17f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 03:30:43 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 03:31:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf1a62e

net-analyzer/icinga2: 2.8.0

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-analyzer/icinga2/Manifest                                    | 1 +
 .../icinga2/{icinga2-9999.ebuild => icinga2-2.8.0.ebuild}        | 9 ++++++---
 net-analyzer/icinga2/icinga2-9999.ebuild                         | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 090e7392568..3174c4329a5 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
 DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785
 DIST icinga2-2.7.2.tar.gz 2471098 SHA256 7e9691ad3389f04a53042d88c1ac8a37e2c9aaf8287856cad3fa48825adaee84 SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d WHIRLPOOL 55e55189b9a1f6646cb94748a7b22731cd5f0d576a858737530187bbab83f40c8973f1a9f508449b0dcb997af443e75a15c9b2ef775c8fe95d1740c72db214c9
+DIST icinga2-2.8.0.tar.gz 2497043 SHA256 bdb1434dc1f502f350c659371c0920d68eeb982add0c5e94b5c16068dbef8fd0 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6 WHIRLPOOL 3af07a98c9debf2bf846e5cbb619e86cdb8b0b91b5a3796b6046ddad96ab23b4526ee47c128ee2c85e82348f6b6a11ac4681604005ac23c9aeebdd7518ce4e3e

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
similarity index 98%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.8.0.ebuild
index 32561101621..1f39bf4c139 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 if [[ ${PV} != 9999 ]]; 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 ~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=""
+	KEYWORDS="~ppc ~ppc64"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
@@ -46,6 +46,9 @@ RDEPEND="
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
+PATCHES=(
+)
+
 want_apache2
 
 pkg_setup() {

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 32561101621..11f3af62273 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 if [[ ${PV} != 9999 ]]; 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 ~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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-11-29 13:38 Agostino Sarubbo
  0 siblings, 0 replies; 176+ messages in thread
From: Agostino Sarubbo @ 2017-11-29 13:38 UTC (permalink / raw
  To: gentoo-commits

commit:     54f70528cda116ba856d13a22f7252e16c7b358d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 13:38:09 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 13:38:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f70528

net-analyzer/icinga2: amd64 stable wrt bug #637640

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 3174c4329a5..894b56c4518 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,4 @@
 DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
 DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785
 DIST icinga2-2.7.2.tar.gz 2471098 SHA256 7e9691ad3389f04a53042d88c1ac8a37e2c9aaf8287856cad3fa48825adaee84 SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d WHIRLPOOL 55e55189b9a1f6646cb94748a7b22731cd5f0d576a858737530187bbab83f40c8973f1a9f508449b0dcb997af443e75a15c9b2ef775c8fe95d1740c72db214c9
-DIST icinga2-2.8.0.tar.gz 2497043 SHA256 bdb1434dc1f502f350c659371c0920d68eeb982add0c5e94b5c16068dbef8fd0 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6 WHIRLPOOL 3af07a98c9debf2bf846e5cbb619e86cdb8b0b91b5a3796b6046ddad96ab23b4526ee47c128ee2c85e82348f6b6a11ac4681604005ac23c9aeebdd7518ce4e3e
+DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6

diff --git a/net-analyzer/icinga2/icinga2-2.8.0.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
index 1f39bf4c139..c60e549c604 100644
--- a/net-analyzer/icinga2/icinga2-2.8.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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="~ppc ~ppc64"
+	KEYWORDS="amd64 ~ppc ~ppc64"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-11-29 18:52 Thomas Deutschmann
  0 siblings, 0 replies; 176+ messages in thread
From: Thomas Deutschmann @ 2017-11-29 18:52 UTC (permalink / raw
  To: gentoo-commits

commit:     786b57625ee3da502bfe65dd6346c8d05f4dc1ca
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 18:48:17 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 18:52:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=786b5762

net-analyzer/icinga2: x86 stable (bug #637640)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

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

diff --git a/net-analyzer/icinga2/icinga2-2.8.0.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
index c60e549c604..a65926a88a9 100644
--- a/net-analyzer/icinga2/icinga2-2.8.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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="amd64 ~ppc ~ppc64"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2017-12-03  4:09 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2017-12-03  4:09 UTC (permalink / raw
  To: gentoo-commits

commit:     4618ee4c7541cb6c179303d342e8c189fc92deff
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 04:08:22 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 04:08:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4618ee4c

net-analyzer/icinga2: remove unused variable

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-analyzer/icinga2/Manifest             | 6 +++---
 net-analyzer/icinga2/icinga2-2.8.0.ebuild | 1 -
 net-analyzer/icinga2/icinga2-9999.ebuild  | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 894b56c4518..ce0f65b730f 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,4 @@
-DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
-DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785
-DIST icinga2-2.7.2.tar.gz 2471098 SHA256 7e9691ad3389f04a53042d88c1ac8a37e2c9aaf8287856cad3fa48825adaee84 SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d WHIRLPOOL 55e55189b9a1f6646cb94748a7b22731cd5f0d576a858737530187bbab83f40c8973f1a9f508449b0dcb997af443e75a15c9b2ef775c8fe95d1740c72db214c9
+DIST icinga2-2.7.0.tar.gz 2435398 BLAKE2B 06a717f818a7c51972d2d095ea1c588ff8d49473aaa765795d1c48ed4ffc12b2c5d560a03a2be3fe45d8d80de8df2b53edcf75d895e0f31cd4723c4883907b47 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb
+DIST icinga2-2.7.1.tar.gz 2475348 BLAKE2B 2e19a3c199b5cbcac78490a9ee1961c8e54f15787d08fa22150a977fb16aa7e736e76b97b66749ebd4070e9d0bfb0c8a484b8430288845de9ac456771d875682 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd
+DIST icinga2-2.7.2.tar.gz 2471098 BLAKE2B 362897613616a15114577a044d56f01093246fa421c307faff1c6208a01e2c62dda2d1ff3aabc2e57b58c1cc6d4cb841a51758f0572945be2eced22390eb98ae SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d
 DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6

diff --git a/net-analyzer/icinga2/icinga2-2.8.0.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
index a65926a88a9..d7a19c659ca 100644
--- a/net-analyzer/icinga2/icinga2-2.8.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
@@ -75,7 +75,6 @@ src_configure() {
 		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
 		-DICINGA2_USER=icinga
 		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
 		-DICINGA2_COMMAND_GROUP=icingacmd
 		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
 		-DLOGROTATE_HAS_SU=ON

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 11f3af62273..ebdd790be87 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -72,7 +72,6 @@ src_configure() {
 		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
 		-DICINGA2_USER=icinga
 		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_USER=icinga
 		-DICINGA2_COMMAND_GROUP=icingacmd
 		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
 		-DLOGROTATE_HAS_SU=ON


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-01-18 18:04 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-01-18 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     5fb79d2d5b67316ce96a4e5acf37cc2ead098fe9
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 18:02:43 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 18:04:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb79d2d

net-analyzer/icinga2: 2.8.1 bup

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.8.1.ebuild | 178 ++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index ce0f65b730f..f9713a68300 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,3 +2,4 @@ DIST icinga2-2.7.0.tar.gz 2435398 BLAKE2B 06a717f818a7c51972d2d095ea1c588ff8d494
 DIST icinga2-2.7.1.tar.gz 2475348 BLAKE2B 2e19a3c199b5cbcac78490a9ee1961c8e54f15787d08fa22150a977fb16aa7e736e76b97b66749ebd4070e9d0bfb0c8a484b8430288845de9ac456771d875682 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd
 DIST icinga2-2.7.2.tar.gz 2471098 BLAKE2B 362897613616a15114577a044d56f01093246fa421c307faff1c6208a01e2c62dda2d1ff3aabc2e57b58c1cc6d4cb841a51758f0572945be2eced22390eb98ae SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d
 DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6
+DIST icinga2-2.8.1.tar.gz 2501182 BLAKE2B a32e60f8888d43eacedaee3cb33b719e2e405a6123710f7806b6c82eccb80eeb0ab0318a34302a5f3b310b258702214148f34719f166b3a3807ef2c9d4b28fa0 SHA512 27dcd2de1a9fa81327fa9cf25f25171e471715b4506dfd312bcd6c10408520cef86d260762f4340a00aaa7824c8ab65baadf541b7e104bd378204667dc92f762

diff --git a/net-analyzer/icinga2/icinga2-2.8.1.ebuild b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
new file mode 100644
index 00000000000..81a25cd01f1
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+PATCHES=(
+)
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 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/*
+	elif 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-03-19 22:39 Sergei Trofimovich
  0 siblings, 0 replies; 176+ messages in thread
From: Sergei Trofimovich @ 2018-03-19 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     78d0b6274d84e8f9a003653ba7dfc98fe077059e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 22:35:45 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 22:39:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d0b627

net-analyzer/icinga2: stable 2.8.1 for ppc, bug #637640

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

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

diff --git a/net-analyzer/icinga2/icinga2-2.8.1.ebuild b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
index ce606b8bb30..646a2279247 100644
--- a/net-analyzer/icinga2/icinga2-2.8.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-03-19 23:24 Sergei Trofimovich
  0 siblings, 0 replies; 176+ messages in thread
From: Sergei Trofimovich @ 2018-03-19 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     03c12107d33b40b0037f2805f5d8ee8df953c1b1
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 23:23:56 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 23:23:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c12107

net-analyzer/icinga2: stable 2.8.1 for ppc64, bug #637640

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

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

diff --git a/net-analyzer/icinga2/icinga2-2.8.1.ebuild b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
index 646a2279247..ed2e1ddc30c 100644
--- a/net-analyzer/icinga2/icinga2-2.8.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-03-22 15:25 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-03-22 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     ecce4c9a716054dfdee2e5cc938d1b0dff1a4669
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 15:24:17 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 15:25:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecce4c9a

net-analyzer/icinga2: 2.8.2 bup

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.8.2.ebuild | 176 ++++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index b71de2bd5a1..0b6e9f882e7 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.8.1.tar.gz 2501182 BLAKE2B a32e60f8888d43eacedaee3cb33b719e2e405a6123710f7806b6c82eccb80eeb0ab0318a34302a5f3b310b258702214148f34719f166b3a3807ef2c9d4b28fa0 SHA512 27dcd2de1a9fa81327fa9cf25f25171e471715b4506dfd312bcd6c10408520cef86d260762f4340a00aaa7824c8ab65baadf541b7e104bd378204667dc92f762
+DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579

diff --git a/net-analyzer/icinga2/icinga2-2.8.2.ebuild b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
new file mode 100644
index 00000000000..4108f14e414
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 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/*
+	elif 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-03-22 17:17 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-03-22 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     dfff36d5a809ea50f80c1a0b21e2469236399e34
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 17:17:01 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 17:17:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfff36d5

net-analyzer/icinga2: 2.8.2 stable amd64 x86 ppc ppc64

removed 2.8.1, fast stable with removal for the following CVEs

CVE-2017-16933, CVE-2018-6532, CVE-2018-6533,
CVE-2018-6534, CVE-2018-6535, CVE-2018-6536

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/icinga2/Manifest             |   1 -
 net-analyzer/icinga2/icinga2-2.8.1.ebuild | 178 ------------------------------
 net-analyzer/icinga2/icinga2-2.8.2.ebuild |   2 +-
 3 files changed, 1 insertion(+), 180 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0b6e9f882e7..50eb7173807 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.8.1.tar.gz 2501182 BLAKE2B a32e60f8888d43eacedaee3cb33b719e2e405a6123710f7806b6c82eccb80eeb0ab0318a34302a5f3b310b258702214148f34719f166b3a3807ef2c9d4b28fa0 SHA512 27dcd2de1a9fa81327fa9cf25f25171e471715b4506dfd312bcd6c10408520cef86d260762f4340a00aaa7824c8ab65baadf541b7e104bd378204667dc92f762
 DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579

diff --git a/net-analyzer/icinga2/icinga2-2.8.1.ebuild b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
deleted file mode 100644
index ed2e1ddc30c..00000000000
--- a/net-analyzer/icinga2/icinga2-2.8.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:3.0 )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-PATCHES=(
-)
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
-	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
-		-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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 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/*
-	elif 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.8.2.ebuild b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
index 4108f14e414..525aa185b12 100644
--- a/net-analyzer/icinga2/icinga2-2.8.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-04-25  2:40 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-04-25  2:40 UTC (permalink / raw
  To: gentoo-commits

commit:     21d101898923ef8f758ac63c4a4bf4d741883151
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 02:27:58 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 02:27:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d10189

net-analyzer/icinga2: 2.8.3 bup

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.8.3.ebuild | 176 ++++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 50eb7173807..513398ab63d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579
+DIST icinga2-2.8.3.tar.gz 2510289 BLAKE2B f94f46276744d469b5f988f72ab45dc16ba49fc73dffe600cfe14b8736a2ddef3e87953f2f78d7db6f7dcd20b75fc317d285d6aa199d95600ab58d3736f2ecd2 SHA512 c5b6724268b298612670a9ed233e41de4d3ea823dade39d17af41d414a78eab0548f1ca07ed8d8f56ef1251f7bb0b6a349129b2ce11c57ac3fec857e67d81018

diff --git a/net-analyzer/icinga2/icinga2-2.8.3.ebuild b/net-analyzer/icinga2/icinga2-2.8.3.ebuild
new file mode 100644
index 00000000000..4108f14e414
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.8.3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	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
+		-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
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=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 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/*
+	elif 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-04-26  2:29 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-04-26  2:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d556fe94d087b69037d4021a4867d0065c2442e4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 02:18:16 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 02:28:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d556fe94

net-analyzer/icinga2: 2.8.4 bup

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 net-analyzer/icinga2/Manifest                                       | 2 +-
 net-analyzer/icinga2/{icinga2-2.8.3.ebuild => icinga2-2.8.4.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 513398ab63d..2fedb34d23a 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,2 @@
 DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579
-DIST icinga2-2.8.3.tar.gz 2510289 BLAKE2B f94f46276744d469b5f988f72ab45dc16ba49fc73dffe600cfe14b8736a2ddef3e87953f2f78d7db6f7dcd20b75fc317d285d6aa199d95600ab58d3736f2ecd2 SHA512 c5b6724268b298612670a9ed233e41de4d3ea823dade39d17af41d414a78eab0548f1ca07ed8d8f56ef1251f7bb0b6a349129b2ce11c57ac3fec857e67d81018
+DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114

diff --git a/net-analyzer/icinga2/icinga2-2.8.3.ebuild b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.8.3.ebuild
rename to net-analyzer/icinga2/icinga2-2.8.4.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-05-23 18:05 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-05-23 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     52f41b122867e3d89233afabe090736073f2b3ef
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 18:00:50 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed May 23 18:05:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f41b12

net-analyzer/icinga2: 2.8.4 stable with cleanup

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 net-analyzer/icinga2/Manifest             |   1 -
 net-analyzer/icinga2/icinga2-2.8.2.ebuild | 176 ------------------------------
 net-analyzer/icinga2/icinga2-2.8.4.ebuild |   2 +-
 3 files changed, 1 insertion(+), 178 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 2fedb34d23a..a04866da9ea 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114

diff --git a/net-analyzer/icinga2/icinga2-2.8.2.ebuild b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
deleted file mode 100644
index 525aa185b12..00000000000
--- a/net-analyzer/icinga2/icinga2-2.8.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:3.0 )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
-	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
-		-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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 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/*
-	elif 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.8.4.ebuild b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
index 4108f14e414..525aa185b12 100644
--- a/net-analyzer/icinga2/icinga2-2.8.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-07-17 16:02 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-07-17 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     8b834fa574a2595f283a10129173bc297c86b6fa
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 15:56:53 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 16:02:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b834fa5

net-analyzer/icinga2: 2.9.0 bup

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-analyzer/icinga2/Manifest                       |  1 +
 .../{icinga2-9999.ebuild => icinga2-2.9.0.ebuild}   | 21 ++++-----------------
 net-analyzer/icinga2/icinga2-9999.ebuild            | 21 ++++-----------------
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a04866da9ea..4ab458d6d22 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
+DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
similarity index 92%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.9.0.ebuild
index ebdd790be87..3085070c612 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
 		net-analyzer/nagios-plugins
 	) )
 	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:3.0 )"
+	classicui? ( net-analyzer/icinga[web] )"
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
@@ -50,9 +49,6 @@ want_apache2
 
 pkg_setup() {
 	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
 	enewgroup icinga
 	enewgroup icingacmd
 	enewgroup nagios  # for plugins
@@ -74,6 +70,7 @@ src_configure() {
 		-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
@@ -98,16 +95,6 @@ src_configure() {
 			-DICINGA2_LTO_BUILD=OFF
 		)
 	fi
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=OFF
-		)
-	fi
 
 	cmake-utils_src_configure
 }

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index ebdd790be87..3085070c612 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
 		net-analyzer/nagios-plugins
 	) )
 	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:3.0 )"
+	classicui? ( net-analyzer/icinga[web] )"
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
@@ -50,9 +49,6 @@ want_apache2
 
 pkg_setup() {
 	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
 	enewgroup icinga
 	enewgroup icingacmd
 	enewgroup nagios  # for plugins
@@ -74,6 +70,7 @@ src_configure() {
 		-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
@@ -98,16 +95,6 @@ src_configure() {
 			-DICINGA2_LTO_BUILD=OFF
 		)
 	fi
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=OFF
-		)
-	fi
 
 	cmake-utils_src_configure
 }


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-07-24 16:25 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-07-24 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     5aa04cf1ac2cfff99af31d486bd86914f08040ea
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 16:24:44 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 16:25:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa04cf1

net-analyzer/icinga2: 2.9.1 bump

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-analyzer/icinga2/Manifest             |   1 +
 net-analyzer/icinga2/icinga2-2.9.1.ebuild | 163 ++++++++++++++++++++++++++++++
 2 files changed, 164 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 4ab458d6d22..c2cfc5087fa 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.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4
+DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533

diff --git a/net-analyzer/icinga2/icinga2-2.9.1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
new file mode 100644
index 00000000000..5911a041405
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins 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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+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? ( || ( 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/*
+	elif 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-08-04 20:47 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-08-04 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c8b9ce70c75adceaa292a175b7b092121933947a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  4 20:46:34 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Aug  4 20:46:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b9ce70

net-analyzer/icinga2: fix postinst link

Fixed in place as no on disk data changed.

Closes: https://bugs.gentoo.org/661850
Package-Manager: Portage-2.3.43, Repoman-2.3.10

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

diff --git a/net-analyzer/icinga2/icinga2-2.9.1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
index 5911a041405..cedd09e7dce 100644
--- a/net-analyzer/icinga2/icinga2-2.9.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
@@ -158,6 +158,6 @@ src_install() {
 pkg_postinst() {
 	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
 		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
 	fi
 }

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 5911a041405..cedd09e7dce 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -158,6 +158,6 @@ src_install() {
 pkg_postinst() {
 	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
 		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
 	fi
 }


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-08-07  7:33 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-08-07  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     c19ff92aa303ed61d0a9f006ca006697df67360d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 07:33:03 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 07:33:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19ff92a

net-analyzer/icinga2: remove broken version

Closes: https://bugs.gentoo.org/661852
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 net-analyzer/icinga2/Manifest                |   1 -
 net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild | 163 ---------------------------
 2 files changed, 164 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index c2cfc5087fa..81abc5d3d4c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
-DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533

diff --git a/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild b/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild
deleted file mode 100644
index 5911a041405..00000000000
--- a/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins 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 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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? ( || ( 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/*
-	elif 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-08-18  2:46 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-08-18  2:46 UTC (permalink / raw
  To: gentoo-commits

commit:     518a35d4df9da4a9d27d4d4258cdc54dc1a2157f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 02:33:49 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 02:46:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518a35d4

net-analyzer/icinga2: 2.9.1 stable amd64 and x86

Package-Manager: Portage-2.3.44, Repoman-2.3.10

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

diff --git a/net-analyzer/icinga2/icinga2-2.9.1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
index cedd09e7dce..85c5c1cbc3e 100644
--- a/net-analyzer/icinga2/icinga2-2.9.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-09-04  1:18 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-09-04  1:18 UTC (permalink / raw
  To: gentoo-commits

commit:     6315448d4d8ab99fc8ded9f40f99d34a876bf458
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 01:18:30 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 01:18:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6315448d

net-analyzer/icinga2: add missing dep

Fixes: https://bugs.gentoo.org/652384
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-analyzer/icinga2/{icinga2-9999.ebuild => icinga2-2.9.1-r1.ebuild} | 3 ++-
 net-analyzer/icinga2/icinga2-9999.ebuild                              | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
similarity index 98%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
index cedd09e7dce..635111837e4 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
@@ -27,7 +27,8 @@ CDEPEND="
 	>=dev-libs/boost-1.58-r1
 	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
 
 DEPEND="
 	${CDEPEND}

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index cedd09e7dce..635111837e4 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -27,7 +27,8 @@ CDEPEND="
 	>=dev-libs/boost-1.58-r1
 	console? ( dev-libs/libedit )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
 
 DEPEND="
 	${CDEPEND}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-09-12 17:43 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-09-12 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c3ced381f4ffbab6980f551d8190c2618bf85873
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 17:42:37 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 17:42:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ced381

net-analyzer/icinga2: update mysql/maria depend

Bug: https://bugs.gentoo.org/665944
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-analyzer/icinga2/icinga2-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 635111837e4..275130c94d6 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -26,7 +26,10 @@ CDEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	>=dev-libs/boost-1.58-r1
 	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
+	mysql? ( || (
+		dev-db/mariadb-connector-c
+		dev-db/mysql-connector-c )
+	)
 	postgres? ( dev-db/postgresql:= )
 	dev-libs/yajl"
 


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-09-12 18:10 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-09-12 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     cb1320023c4b367677cb90fee9cfdfc5099e3bdc
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 18:10:15 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 18:10:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb132002

net-analyzer/icinga2: more mysql/maria updates

Bug: https://bugs.gentoo.org/665944
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-analyzer/icinga2/icinga2-9999.ebuild | 19 ++++++++++++-------
 net-analyzer/icinga2/metadata.xml        |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 275130c94d6..c0f291e4ea2 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -26,10 +26,8 @@ CDEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	>=dev-libs/boost-1.58-r1
 	console? ( dev-libs/libedit )
-	mysql? ( || (
-		dev-db/mariadb-connector-c
-		dev-db/mysql-connector-c )
-	)
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
 	dev-libs/yajl"
 
@@ -47,7 +45,7 @@ RDEPEND="
 	mail? ( virtual/mailx )
 	classicui? ( net-analyzer/icinga[web] )"
 
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 
 want_apache2
 
@@ -118,7 +116,14 @@ src_install() {
 		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/*
-	elif use postgres ; then
+	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 ; then
 		docinto schema
 		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
 		docinto schema/upgrade

diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index b03390bc2e5..73dade68872 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="console">Adds support for line-editing in the console</flag>
 		<flag name="lto">Adds support for link time optimization</flag>
 		<flag name="mail">Allows for mailing of alerts</flag>
+		<flag name="mariadb">Enable support for the mariadb database backend</flag>
 		<flag name="studio">Adds support for Icinga-studio</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-09-12 18:25 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-09-12 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     62334d13b81cd608986742c76b7cb49d785d44b1
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 18:25:12 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 18:25:27 2018 +0000
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 00000000000..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} != 9999 ]]; 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-09-26 17:49 Matt Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matt Thode @ 2018-09-26 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     06619d56dacddce51c22193da28bd699b02ce489
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 17:48:42 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 17:49:04 2018 +0000
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 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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 00000000000..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} != 9999 ]]; 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-10-12  2:54 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2018-10-12  2:54 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: 2.10.0 bump

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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 00000000000..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} != 9999 ]]; 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-10-19 19:38 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2018-10-19 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     4e8ef75b148093639aaeeaa08a472813c0111e91
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 19 19:38:21 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 19:38:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8ef75b

net-analyzer/icinga2: 2.10.1 bump

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 cccc60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178 SHA512 88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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 00000000000..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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-10-22 16:08 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2018-10-22 16:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3bf198014bcdb7cc9fb7910ae839ef11e9df8cc4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 16:07:47 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 16:08:13 2018 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-11-14 11:22 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2018-11-14 11:22 UTC (permalink / raw
  To: gentoo-commits

commit:     e0e5fed1829734d519ebb9915491da637d2bb83c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 14 11:20:22 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov 14 11:20:22 2018 +0000
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 <prometheanfire <AT> 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 cccc60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178 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 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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 00000000000..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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2018-12-13 17:11 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2018-12-13 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     1cc0006790932eeaa449a6d31e32525f9495787e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 17:11:09 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 17:11:09 2018 +0000
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 <prometheanfire <AT> 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 cccc60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178 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 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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..00000000000
--- 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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.10.2.ebuild b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
index 913217ef694..e19f3c3869b 100644
--- a/net-analyzer/icinga2/icinga2-2.10.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"

diff --git a/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
deleted file mode 100644
index 635111837e4..00000000000
--- a/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins 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 )
-	mysql? ( virtual/mysql )
-	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? ( || ( 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/*
-	elif 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.9.2.ebuild b/net-analyzer/icinga2/icinga2-2.9.2.ebuild
deleted file mode 100644
index e5caea793dd..00000000000
--- a/net-analyzer/icinga2/icinga2-2.9.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} != 9999 ]]; 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-02-26 23:33 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-02-26 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a3213b773f228b3f67da986f4b58e934b7083f86
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 23:32:37 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 23:32:37 2019 +0000
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 <prometheanfire <AT> 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 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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 00000000000..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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-03-20 23:35 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-03-20 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     85e58a6302ecedddf70df5f8b8805275b9b4be74
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 23:30:34 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 23:35:34 2019 +0000
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 <prometheanfire <AT> 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 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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 00000000000..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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-03-26 15:54 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-03-26 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     75af28bcc0607df827f9e93427f6d12984f18083
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 15:44:50 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 15:54:12 2019 +0000
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 <prometheanfire <AT> 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 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc 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..00000000000
--- 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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.10.3.ebuild b/net-analyzer/icinga2/icinga2-2.10.3.ebuild
deleted file mode 100644
index 8a9695a5e27..00000000000
--- a/net-analyzer/icinga2/icinga2-2.10.3.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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.10.4.ebuild b/net-analyzer/icinga2/icinga2-2.10.4.ebuild
index 8a9695a5e27..45914f5d789 100644
--- a/net-analyzer/icinga2/icinga2-2.10.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"

diff --git a/net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild b/net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild
deleted file mode 100644
index c0f291e4ea2..00000000000
--- a/net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.9.1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
deleted file mode 100644
index 85c5c1cbc3e..00000000000
--- a/net-analyzer/icinga2/icinga2-2.9.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins 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 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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? ( || ( 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/*
-	elif 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-05-24 18:13 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-05-24 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     79226a674f40c26971cd274d95921b1706cbcece
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 18:12:16 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri May 24 18:13:42 2019 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-06-24  0:15 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-06-24  0:15 UTC (permalink / raw
  To: gentoo-commits

commit:     eff2131ce92483e3e3367ac2bdafc390334664ca
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 00:13:21 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 00:15:08 2019 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
index 8a9695a5e27..45914f5d789 100644
--- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"

diff --git a/net-analyzer/icinga2/icinga2-2.8.4.ebuild b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
deleted file mode 100644
index 525aa185b12..00000000000
--- a/net-analyzer/icinga2/icinga2-2.8.4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; 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="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +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 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-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] )
-	studio? ( x11-libs/wxGTK:3.0 )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
-	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
-		-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
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=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 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/*
-	elif 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}

diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 73dade68872..6c4dccde701 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="lto">Adds support for link time optimization</flag>
 		<flag name="mail">Allows for mailing of alerts</flag>
 		<flag name="mariadb">Enable support for the mariadb database backend</flag>
-		<flag name="studio">Adds support for Icinga-studio</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-07-31 15:36 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-07-31 15:36 UTC (permalink / raw
  To: gentoo-commits

commit:     3701f980625f0bd14d28b7509935e293c5027a7c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 15:32:39 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 15:36:42 2019 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-09-01 18:47 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-09-01 18:47 UTC (permalink / raw
  To: gentoo-commits

commit:     9ba07b467183b1221b2d54c829b39b7f67fc0427
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 18:45:29 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 18:47:30 2019 +0000
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 <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 3 +--
 net-analyzer/icinga2/icinga2-9999.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} != 9999 ]]; 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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 913217ef694..d8066e1db2f 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-09-17 15:44 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-09-17 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     cc4b82436a745c0a8f87615017e1c8e2489f8df0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 15:44:29 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 15:44:47 2019 +0000
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 <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/icinga2-2.10.5.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index d8066e1db2f..a250b183b14 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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:= )


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-09-20 21:07 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-09-20 21:07 UTC (permalink / raw
  To: gentoo-commits

commit:     3c99b4df871a92e1fc9ebf1f4fcd95a8b4789776
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 21:06:55 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 21:07:29 2019 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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)
+			-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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-09-21 16:28 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-09-21 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     7eb1249535c8526faebb363a84f715f6eb86bd50
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 21 16:28:07 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 16:28:20 2019 +0000
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 <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/icinga2-2.11.0.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index a250b183b14..3ec54860fd1 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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:= )


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-09-22  6:07 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-09-22  6:07 UTC (permalink / raw
  To: gentoo-commits

commit:     88f20115574f83da8068a36059f6a30e7244c657
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 22 06:05:37 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 06:07:52 2019 +0000
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 <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/icinga2-2.11.0.ebuild | 5 +++--
 net-analyzer/icinga2/icinga2-9999.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} != 9999 ]]; 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]
+	<dev-libs/boost-1.71.0
 	console? ( dev-libs/libedit )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	mysql? ( dev-db/mysql-connector-c:= )

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 3ec54860fd1..31e997e9e6a 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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.66:=
+	>=dev-libs/boost-1.66:=[context]
 	console? ( dev-libs/libedit )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	mysql? ( dev-db/mysql-connector-c:= )


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-09-23 15:23 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-09-23 15:23 UTC (permalink / raw
  To: gentoo-commits

commit:     d9b4f8d1a1a813c7356723abc12d98e3134503ae
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 15:22:52 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 15:23:08 2019 +0000
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 <prometheanfire <AT> 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]
-	<dev-libs/boost-1.71.0
 	console? ( dev-libs/libedit )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	mysql? ( dev-db/mysql-connector-c:= )


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-10-18 16:03 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-10-18 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     1c9c97e4aebdfbd451fd6cfb9d90b1bc75a41eba
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 15:30:40 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 16:02:51 2019 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-11-22 16:10 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-11-22 16:10 UTC (permalink / raw
  To: gentoo-commits

commit:     c043d1afead1045b04860a97f28026e7800c6531
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 16:09:23 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 16:09:59 2019 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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; 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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
index cb76f2a6cf7..c01fcf4d1cd 100644
--- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"
+	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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2019-12-16 17:37 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2019-12-16 17:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fe8651068ff3f480703cb4262a36208948846873
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 17:37:06 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 17:37:21 2019 +0000
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 <prometheanfire <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 31e997e9e6a..39558b4834e 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-02-08 17:06 David Seifert
  0 siblings, 0 replies; 176+ messages in thread
From: David Seifert @ 2020-02-08 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     74caa6219da1f4bf5ddb243dadd8861609ccee73
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 17:05:40 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 17:05:40 2020 +0000
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 <soap <AT> 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-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 39558b4834e..1f48b8612c0 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-02-17 23:37 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-02-17 23:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3cb7e18ccc73d320423f8b6840a63b596ccc6ee0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 23:29:12 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 23:37:45 2020 +0000
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 <prometheanfire <AT> 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-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 157a2ed119e..92b7c65b3f1 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="classicui">Adds support for the old interface</flag>
 		<flag name="console">Adds support for line-editing in the console</flag>
 		<flag name="lto">Adds support for link time optimization</flag>
 		<flag name="mail">Allows for mailing of alerts</flag>


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-03-04 17:11 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-03-04 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     475a0b267898fbfe225bd246e8642f2e19f6963b
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 16:53:40 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Mar  4 17:11:03 2020 +0000
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 <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/Manifest                       |  1 +
 .../{icinga2-9999.ebuild => icinga2-2.11.3.ebuild}  | 21 ++++++++++-----------
 net-analyzer/icinga2/icinga2-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
similarity index 92%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.11.3.ebuild
index 92b7c65b3f1..42ebd83d611 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 if [[ ${PV} != 9999 ]]; 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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 92b7c65b3f1..7243f8baa7c 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 if [[ ${PV} != 9999 ]]; 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"
 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
@@ -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() {


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-04-04 21:05 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-04-04 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     82196216f4ce4aacfa12ff9051ee739b93b76c95
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 19:47:25 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Apr  4 21:05:39 2020 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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
-		-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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
deleted file mode 100644
index 6c9a7ab3cdf..00000000000
--- a/net-analyzer/icinga2/icinga2-2.10.6.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} != 9999 ]]; 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="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
-		-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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
deleted file mode 100644
index ec0fd092da5..00000000000
--- a/net-analyzer/icinga2/icinga2-2.11.2.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} != 9999 ]]; 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="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 )"
-
-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
-		-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-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.11.3.ebuild b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
index 42ebd83d611..a98d579ea65 100644
--- a/net-analyzer/icinga2/icinga2-2.11.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-06-19 15:50 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-06-19 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a65ae6bd6e44d7b54bfdbbb34360ad58c52d514d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 15:49:37 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 15:50:04 2020 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-07-18 22:12 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-07-18 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f225bb9e95f3e81452b0aea7ee3bd7fa5bd241fc
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 22:03:10 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 22:12:03 2020 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.11.4.ebuild b/net-analyzer/icinga2/icinga2-2.11.4.ebuild
index 42ebd83d611..a98d579ea65 100644
--- a/net-analyzer/icinga2/icinga2-2.11.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-08-04 21:51 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-08-04 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     43735fcae35f07f6a10546bff23888150cdbf880
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 21:50:56 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 21:51:08 2020 +0000
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 <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/Manifest                                       | 2 ++
 net-analyzer/icinga2/{icinga2-9999.ebuild => icinga2-2.11.5.ebuild} | 4 ++--
 net-analyzer/icinga2/{icinga2-9999.ebuild => icinga2-2.12.0.ebuild} | 4 ++--
 net-analyzer/icinga2/icinga2-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-2.11.5.ebuild
similarity index 98%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.11.5.ebuild
index 7243f8baa7c..bb0f2605e73 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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-9999.ebuild b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
similarity index 98%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.12.0.ebuild
index 7243f8baa7c..bb0f2605e73 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 7243f8baa7c..bb0f2605e73 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; 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:= )


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-09-04  2:35 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-09-04  2:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c5c0703ea502b98d37918249fcbfd91fec6dcd91
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 02:34:46 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 02:35:11 2020 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 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 ; 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}/var/run" || die "failed to remove /var/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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-09-04  2:35 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-09-04  2:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d9e0ffeab02531cac12f0d3bb39657cd3c15ef41
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 02:34:00 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 02:35:09 2020 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-10-14 18:10 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-10-14 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     7cbdb4d7dbaee40c2f923e7c0a7eefd11cb6cc1f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 18:09:51 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 18:10:04 2020 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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+=(
+			-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-3 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 ; 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-10-16 11:49 Louis Sautier
  0 siblings, 0 replies; 176+ messages in thread
From: Louis Sautier @ 2020-10-16 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     590afb58d9dbca67e9160a9f36f67f6181854ac9
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 11:44:58 2020 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 11:49:20 2020 +0000
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 <sbraz <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index bb0f2605e73..c19de03c6e7 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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} != 9999 ]]; 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
-		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
+	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
+	if use postgres; then
 		docinto schema
 		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
 		docinto schema/upgrade
@@ -163,8 +132,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
 	fi
 }


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-10-16 11:49 Louis Sautier
  0 siblings, 0 replies; 176+ messages in thread
From: Louis Sautier @ 2020-10-16 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     3a6c8c8dc1d23ea065d2fe9282c1e06aff86ab6e
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 11:46:56 2020 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 11:49:20 2020 +0000
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 <sbraz <AT> 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..00000000000
--- 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} != 9999 ]]; 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+=(
-			-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-3 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 ; 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-10-16 11:53 Louis Sautier
  0 siblings, 0 replies; 176+ messages in thread
From: Louis Sautier @ 2020-10-16 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     217678a0bb9254fb7b1c0070235c5cd946008ab1
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 11:51:36 2020 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 11:52:39 2020 +0000
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 <sbraz <AT> 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 @@
 	<use>
 		<flag name="console">Adds support for line-editing in the console</flag>
 		<flag name="lto">Adds support for link time optimization</flag>
-		<flag name="jumbo-build">Combine source files to speed up build process (may speed up build but requires more memory)</flag>
+		<flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag>
 		<flag name="mail">Allows for mailing of alerts</flag>
 		<flag name="mariadb">Enable support for the mariadb database backend</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-11-14 23:03 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-11-14 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     62551f77264ffbdfd2e4d2dec680376a1d45b8fe
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 23:02:38 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 23:03:24 2020 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-11-24 21:50 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-11-24 21:50 UTC (permalink / raw
  To: gentoo-commits

commit:     96fbd46eb640f77298bd709a4ae5385835e16fd8
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 21:49:19 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 21:50:16 2020 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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)
+			-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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-12-15 20:12 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-12-15 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     614ab7a83dc4191a4565afe7d7d3d0b813b7f9e8
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 18:13:39 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 20:12:29 2020 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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)
+			-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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-12-20 19:57 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-12-20 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     8789f0d39925b8004ab901f3bb728e00ad0b66b0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 19:56:22 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 19:57:37 2020 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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+=(
-			-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-3 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 ; 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2020-12-24 16:59 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2020-12-24 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     0f5fd7448b1180caddce77fde2105ea451442dbe
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 16:59:04 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 16:59:20 2020 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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)
-			-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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.12.3.ebuild b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
index 8ec76ee82fa..ad2f31c9b0f 100644
--- a/net-analyzer/icinga2/icinga2-2.12.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-01-24 19:15 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-01-24 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     35662b97bb5556fa3801b9e2258e52c850adacb2
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 19:15:00 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:15:19 2021 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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+=(
-			-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-3 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 ; 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.12.1.ebuild b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
deleted file mode 100644
index ad2f31c9b0f..00000000000
--- a/net-analyzer/icinga2/icinga2-2.12.1.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} != 9999 ]]; 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)
-			-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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-04-30 18:46 Mikle Kolyada
  0 siblings, 0 replies; 176+ messages in thread
From: Mikle Kolyada @ 2021-04-30 18:46 UTC (permalink / raw
  To: gentoo-commits

commit:     5085c0b4e499296bf8ee551320a0e35d1d983ef8
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 18:45:08 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 18:45:08 2021 +0000
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 <zlogene <AT> gentoo.org>

 net-analyzer/icinga2/icinga2-2.12.3.ebuild | 7 +++----
 net-analyzer/icinga2/icinga2-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index c19de03c6e7..b2d610c7c41 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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:= )


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-05-28 15:52 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-05-28 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d0773ba2ddd7da40940873e9bbfa91be7b98b062
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 15:51:44 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri May 28 15:52:00 2021 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-05-28 19:46 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-05-28 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4775db5849c2e64cd4a0e6b77b7a21c44ec33781
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 19:46:17 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri May 28 19:46:29 2021 +0000
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 <prometheanfire <AT> 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() {


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-06-29  2:54 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-06-29  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3358040ed16d9d0a1ad777cfeefe1aa8eebce96c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 02:53:53 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 02:54:10 2021 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.12.4.ebuild b/net-analyzer/icinga2/icinga2-2.12.4.ebuild
index de80eb55dfc..3e79963a2e6 100644
--- a/net-analyzer/icinga2/icinga2-2.12.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.4.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-08-03 20:23 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-08-03 20:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e5336fc3e2e4f8b67a1432928b299ed7edb9abea
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  3 20:23:10 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Aug  3 20:23:23 2021 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-08-20 17:05 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-08-20 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     13826a23b720f436032d519d0beac6b0cddd2b96
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 20 17:05:30 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Aug 20 17:05:44 2021 +0000
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 <prometheanfire <AT> 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 00000000000..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} != 9999 ]]; 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-09-20 21:34 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-09-20 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3b88b3d1c860269d8f7351737b884f6ccf3ce329
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 20 21:31:09 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 20 21:34:19 2021 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-10-20 15:34 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-10-20 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d945921ecd56547100ec24d9d6a353c0adc804b2
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 15:31:09 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 15:34:13 2021 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-11-12  4:07 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-11-12  4:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c1cbd96f361f2f5d82a03fc5f9882e6b53506670
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 12 04:06:22 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 04:06:58 2021 +0000
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 <prometheanfire <AT> 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..00000000000
--- 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} != 9999 ]]; 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-11-14  2:24 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-11-14  2:24 UTC (permalink / raw
  To: gentoo-commits

commit:     eb92a576ec84dc783d578527c28aaa869d67fdae
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 02:23:45 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 02:23:59 2021 +0000
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 <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-11-29  2:51 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-11-29  2:51 UTC (permalink / raw
  To: gentoo-commits

commit:     e60b54f49fa11d375c741a65768b956398cd540e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 02:50:46 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 02:51:03 2021 +0000
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 <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-11-29  2:51 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-11-29  2:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f0e78a5a586bc856254ed40ffed7d2c0b10da4e3
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 02:49:53 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 02:51:01 2021 +0000
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 <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+		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 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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-12-14 17:54 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-12-14 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     e75775ffd0773438f7eec53264cf2f5813f91dda
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 17:54:01 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 17:54:36 2021 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-12-29 17:20 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-12-29 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     9cd116618c6110a18eb9995a986f6c8aa63ce5ff
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 17:19:46 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 17:19:46 2021 +0000
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 <prometheanfire <AT> 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


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2021-12-29 17:20 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2021-12-29 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     29c0f4abdb1bd2638c84c0b946af174326f7d3dd
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 17:18:13 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 17:18:13 2021 +0000
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 <prometheanfire <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index b2d610c7c413..da2f2e0ac156 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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
 


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-01-03 15:58 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-01-03 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     836eb0586634c5d1a5da7e59775c9880c5c5c545
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 15:58:00 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 15:58:14 2022 +0000
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 <prometheanfire <AT> 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


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-01-15 17:54 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-01-15 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     ddcb18f8d2d6e61f6bd78770a978656bdfcf4880
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 17:51:42 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 17:54:20 2022 +0000
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 <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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 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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-04-14 16:26 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-04-14 16:26 UTC (permalink / raw
  To: gentoo-commits

commit:     c153f5d580e251d2baad4932156ef1d98c2b17cb
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 16:25:47 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 16:26:14 2022 +0000
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 <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-05-17 17:34 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-05-17 17:34 UTC (permalink / raw
  To: gentoo-commits

commit:     52818dbc3bba7a0e02769a76dc82b4fbc57f6d48
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 18:21:47 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue May 17 17:33:58 2022 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-06-14 22:33 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-06-14 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     2e584f913851768415b2ad8a5af3ffef6e37d907
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 22:33:23 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 22:33:23 2022 +0000
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 <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-		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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-06-30 21:16 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-06-30 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     bfbc07799e5bcdf49630d566316033a548d297eb
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 21:11:07 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 21:16:35 2022 +0000
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 <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-08-01  3:13 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-08-01  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     6856172592bf49f4a233dfa8fa8b6116f0ef764e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 03:11:48 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 03:13:48 2022 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-08-16 16:46 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-08-16 16:46 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: add 2.13.5

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-08-31 15:38 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-08-31 15:38 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.13.3

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-	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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-09-13 16:31 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-09-13 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e7471f9d1a23eb8d78528e33315d33a53772cec4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 16:31:37 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 16:31:37 2022 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-10-14 16:47 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-10-14 16:47 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.13.4

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-11-08 16:57 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-11-08 16:57 UTC (permalink / raw
  To: gentoo-commits

commit:     48b03d794b6e7831804c3dc10049127f66451af6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 16:53:41 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 16:57:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b03d79

net-analyzer/icinga2: add 2.13.6

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2022-12-07 19:17 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2022-12-07 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     877cff4c26818cf840d434124798e39270a7556a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 19:13:08 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 19:17:24 2022 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-01-07 19:34 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-01-07 19:34 UTC (permalink / raw
  To: gentoo-commits

commit:     e6ecf39c56a39a5a26236e6d38fdc318c05dffe1
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 19:34:17 2023 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 19:34:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ecf39c

net-analyzer/icinga2: drop 2.13.5

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-01-14 22:47 Sam James
  0 siblings, 0 replies; 176+ messages in thread
From: Sam James @ 2023-01-14 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     2a0968d973600c6076ceb293c72687c79cda1522
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 22:47:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 22:47:44 2023 +0000
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 <sam <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-01-14 22:47 Sam James
  0 siblings, 0 replies; 176+ messages in thread
From: Sam James @ 2023-01-14 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     8f7949b17a2afeda8846a35a202a8d5cb427f1f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 22:47:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 22:47:45 2023 +0000
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 <sam <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-02-01 19:27 Andreas Sturmlechner
  0 siblings, 0 replies; 176+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 19:27 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.13.6

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-02-17 18:55 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-02-17 18:55 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: add 2.13.7

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-02-18  3:10 Sam James
  0 siblings, 0 replies; 176+ messages in thread
From: Sam James @ 2023-02-18  3:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d02761e91d6a0381a78588da2d37f8d82fd9a093
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 03:10:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 03:10:29 2023 +0000
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 <sam <AT> 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)


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-03-18 16:37 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-03-18 16:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9646028ce726a940756070ede2338470d12104ba
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:35:23 2023 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:35:23 2023 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-03-18 16:37 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-03-18 16:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9258ac2355aaef05fce7c32e77f3365ba89910d5
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:36:28 2023 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:36:28 2023 +0000
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 <prometheanfire <AT> gentoo.org>

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

diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 2c5482fe5a8f..e74ff9ec6c08 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.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() {


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-03-18 16:45 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-03-18 16:45 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: remove systemd eclass import

Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

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

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


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-04-20 15:46 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-04-20 15:46 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.13.6-r1

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-	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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-07-13 16:19 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-07-13 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f74b61f756a51b44ead224f51514d3cdcc444b23
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 16:19:01 2023 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 16:19:52 2023 +0000
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 <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}

diff --git a/net-analyzer/icinga2/icinga2-2.14.0.ebuild b/net-analyzer/icinga2/icinga2-2.14.0.ebuild
new file mode 100644
index 000000000000..06a84427309d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.14.0.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} != 9999 ]]; 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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-08-13 20:29 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-08-13 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     358917b116067903d417e672165be20fdfaf68c8
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 20:28:26 2023 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 20:28:26 2023 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-09-13 18:52 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-09-13 18:52 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.13.7

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-12-21 22:02 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-12-21 22:02 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: add 2.14.1

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2023-12-21 22:02 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2023-12-21 22:02 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: add 2.13.9

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-01-12 19:08 Michał Górny
  0 siblings, 0 replies; 176+ messages in thread
From: Michał Górny @ 2024-01-12 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     89b4792e9819868f2089d3d7b47fa30b0d0875b0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 13:50:46 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 19:08:15 2024 +0000
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 <mgorny <AT> 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-9999.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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 93def667f4f3..f2525a95a10b 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql +plugins postgres systemd"
+IUSE="console jumbo-build mail mariadb minimal +mysql +plugins postgres systemd"
 
 # 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


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-01-19  1:28 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-01-19  1:28 UTC (permalink / raw
  To: gentoo-commits

commit:     b937b6c90a9f028eb71fcb1d75a6fdb1f8377961
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 01:28:21 2024 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 01:28:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b937b6c9

net-analyzer/icinga2: add 2.14.2

Signed-off-by: Matthew Thode <prometheanfire <AT> 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 000000000000..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} != 9999 ]]; 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
+		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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-01-21 17:09 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-01-21 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     443d5d5c3b63b3958ada8766aa8464f3fc65a9b4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 17:08:48 2024 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 17:09:43 2024 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-01-21 17:09 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-01-21 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     6e74f7818fa598af9aa48e0384acea5659e2a2f7
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 17:09:21 2024 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 17:09:44 2024 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-02-18 23:10 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-02-18 23:10 UTC (permalink / raw
  To: gentoo-commits

commit:     6d2edd1d16adbd699a543d0c4b6feb4749febc5c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 23:10:00 2024 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 23:10:26 2024 +0000
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 <prometheanfire <AT> 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} != 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-02-21 20:17 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-02-21 20:17 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.13.8

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-		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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-02-21 20:17 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-02-21 20:17 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.14.0

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-		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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-03-18 16:01 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-03-18 16:01 UTC (permalink / raw
  To: gentoo-commits

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

net-analyzer/icinga2: drop 2.14.1

Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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} != 9999 ]]; 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
-		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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 176+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
@ 2024-11-12 17:51 Matthew Thode
  0 siblings, 0 replies; 176+ messages in thread
From: Matthew Thode @ 2024-11-12 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     64c820ed16b7233607fccaa98c44811594582e62
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 17:50:24 2024 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 17:51:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c820ed

net-analyzer/icinga2: add 2.14.3, drop 2.14.2

Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/Manifest                                         | 2 +-
 net-analyzer/icinga2/{icinga2-2.14.2.ebuild => icinga2-2.14.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 5e6efce507f8..1a3b1bfa45df 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1 @@
-DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9 SHA512 a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57
+DIST icinga2-2.14.3.tar.gz 9397891 BLAKE2B 8808154d585a422d674c6384691f029fa2fe84615dc388648d948410c63c6ea30c96ba900b96f9af954654f0a65575d1875b472985733d8153bc6fc5e5ee00d5 SHA512 7285b32d353d0e68e9925a937feb922f4404557a7a72a03eb16991db207e5f8988cdbd7ca6f3871494be9e5027c70f8062c29fba88b8f0424c2548ca1b2805d6

diff --git a/net-analyzer/icinga2/icinga2-2.14.2.ebuild b/net-analyzer/icinga2/icinga2-2.14.3.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.14.2.ebuild
rename to net-analyzer/icinga2/icinga2-2.14.3.ebuild


^ permalink raw reply related	[flat|nested] 176+ messages in thread

end of thread, other threads:[~2024-11-12 17:51 UTC | newest]

Thread overview: 176+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-24 13:11 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/ Matt Thode
  -- strict thread matches above, loose matches on Subject: below --
2024-11-12 17:51 Matthew Thode
2024-03-18 16:01 Matthew Thode
2024-02-21 20:17 Matthew Thode
2024-02-21 20:17 Matthew Thode
2024-02-18 23:10 Matthew Thode
2024-01-21 17:09 Matthew Thode
2024-01-21 17:09 Matthew Thode
2024-01-19  1:28 Matthew Thode
2024-01-12 19:08 Michał Górny
2023-12-21 22:02 Matthew Thode
2023-12-21 22:02 Matthew Thode
2023-09-13 18:52 Matthew Thode
2023-08-13 20:29 Matthew Thode
2023-07-13 16:19 Matthew Thode
2023-04-20 15:46 Matthew Thode
2023-03-18 16:45 Matthew Thode
2023-03-18 16:37 Matthew Thode
2023-03-18 16:37 Matthew Thode
2023-02-18  3:10 Sam James
2023-02-17 18:55 Matthew Thode
2023-02-01 19:27 Andreas Sturmlechner
2023-01-14 22:47 Sam James
2023-01-14 22:47 Sam James
2023-01-07 19:34 Matthew Thode
2022-12-07 19:17 Matthew Thode
2022-11-08 16:57 Matthew Thode
2022-10-14 16:47 Matthew Thode
2022-09-13 16:31 Matthew Thode
2022-08-31 15:38 Matthew Thode
2022-08-16 16:46 Matthew Thode
2022-08-01  3:13 Matthew Thode
2022-06-30 21:16 Matthew Thode
2022-06-14 22:33 Matthew Thode
2022-05-17 17:34 Matthew Thode
2022-04-14 16:26 Matthew Thode
2022-01-15 17:54 Matthew Thode
2022-01-03 15:58 Matthew Thode
2021-12-29 17:20 Matthew Thode
2021-12-29 17:20 Matthew Thode
2021-12-14 17:54 Matthew Thode
2021-11-29  2:51 Matthew Thode
2021-11-29  2:51 Matthew Thode
2021-11-14  2:24 Matthew Thode
2021-11-12  4:07 Matthew Thode
2021-10-20 15:34 Matthew Thode
2021-09-20 21:34 Matthew Thode
2021-08-20 17:05 Matthew Thode
2021-08-03 20:23 Matthew Thode
2021-06-29  2:54 Matthew Thode
2021-05-28 19:46 Matthew Thode
2021-05-28 15:52 Matthew Thode
2021-04-30 18:46 Mikle Kolyada
2021-01-24 19:15 Matthew Thode
2020-12-24 16:59 Matthew Thode
2020-12-20 19:57 Matthew Thode
2020-12-15 20:12 Matthew Thode
2020-11-24 21:50 Matthew Thode
2020-11-14 23:03 Matthew Thode
2020-10-16 11:53 Louis Sautier
2020-10-16 11:49 Louis Sautier
2020-10-16 11:49 Louis Sautier
2020-10-14 18:10 Matthew Thode
2020-09-04  2:35 Matthew Thode
2020-09-04  2:35 Matthew Thode
2020-08-04 21:51 Matthew Thode
2020-07-18 22:12 Matthew Thode
2020-06-19 15:50 Matthew Thode
2020-04-04 21:05 Matthew Thode
2020-03-04 17:11 Matthew Thode
2020-02-17 23:37 Matthew Thode
2020-02-08 17:06 David Seifert
2019-12-16 17:37 Matthew Thode
2019-11-22 16:10 Matthew Thode
2019-10-18 16:03 Matthew Thode
2019-09-23 15:23 Matthew Thode
2019-09-22  6:07 Matthew Thode
2019-09-21 16:28 Matthew Thode
2019-09-20 21:07 Matthew Thode
2019-09-17 15:44 Matthew Thode
2019-09-01 18:47 Matthew Thode
2019-07-31 15:36 Matthew Thode
2019-06-24  0:15 Matthew Thode
2019-05-24 18:13 Matthew Thode
2019-03-26 15:54 Matthew Thode
2019-03-20 23:35 Matthew Thode
2019-02-26 23:33 Matthew Thode
2018-12-13 17:11 Matthew Thode
2018-11-14 11:22 Matthew Thode
2018-10-22 16:08 Matthew Thode
2018-10-19 19:38 Matthew Thode
2018-10-12  2:54 Matthew Thode
2018-09-26 17:49 Matt Thode
2018-09-12 18:25 Matt Thode
2018-09-12 18:10 Matt Thode
2018-09-12 17:43 Matt Thode
2018-09-04  1:18 Matt Thode
2018-08-18  2:46 Matt Thode
2018-08-07  7:33 Matt Thode
2018-08-04 20:47 Matt Thode
2018-07-24 16:25 Matt Thode
2018-07-17 16:02 Matt Thode
2018-05-23 18:05 Matt Thode
2018-04-26  2:29 Matt Thode
2018-04-25  2:40 Matt Thode
2018-03-22 17:17 Matt Thode
2018-03-22 15:25 Matt Thode
2018-03-19 23:24 Sergei Trofimovich
2018-03-19 22:39 Sergei Trofimovich
2018-01-18 18:04 Matt Thode
2017-12-03  4:09 Matt Thode
2017-11-29 18:52 Thomas Deutschmann
2017-11-29 13:38 Agostino Sarubbo
2017-11-17  3:31 Matt Thode
2017-11-12 15:28 Matt Thode
2017-10-17  1:42 Matt Thode
2017-09-21 16:28 Matt Thode
2017-08-28  2:11 Matt Thode
2017-08-04 19:31 Matt Thode
2017-08-02 18:52 Matt Thode
2017-07-24  2:03 Matt Thode
2017-07-24  1:57 Matt Thode
2017-05-16 22:05 Michael Weber
2017-04-28 17:00 Matt Thode
2017-03-29 18:08 Matt Thode
2017-02-24 17:39 Matt Thode
2017-02-13 15:51 Matt Thode
2017-01-31 15:45 Matt Thode
2017-01-26 15:38 Matt Thode
2017-01-06 22:53 Matt Thode
2016-12-13 16:14 Matt Thode
2016-11-27 20:03 Matt Thode
2016-11-24  0:59 Matt Thode
2016-11-24  0:59 Matt Thode
2016-11-24  0:59 Matt Thode
2016-11-23 23:35 Matt Thode
2016-09-25 16:11 Matt Thode
2016-08-31 13:00 Matt Thode
2016-08-25 14:40 Matt Thode
2016-08-24 22:22 Matt Thode
2016-08-23 22:58 Matt Thode
2016-07-13 17:36 Anthony G. Basile
2016-05-19 17:05 Matt Thode
2016-04-30  3:08 Matt Thode
2016-04-30  3:06 Matt Thode
2016-04-21 14:43 Matt Thode
2016-04-20 18:28 Matt Thode
2016-04-20 15:54 Matt Thode
2016-03-26 18:06 Agostino Sarubbo
2016-03-18 12:50 Matt Thode
2016-03-17 20:45 Matt Thode
2016-03-16 16:33 Matt Thode
2016-02-24 16:38 Matt Thode
2016-02-23 19:58 Matt Thode
2016-01-25 15:44 Agostino Sarubbo
2016-01-21  3:06 Matt Thode
2016-01-18 17:04 Matt Thode
2016-01-18 16:50 Matt Thode
2016-01-05 15:31 Matt Thode
2016-01-05 15:26 Matt Thode
2015-12-25 20:20 Matt Thode
2015-11-28 20:19 Matt Thode
2015-11-28 20:12 Matt Thode
2015-11-20  1:04 Matt Thode
2015-11-16 16:04 Matt Thode
2015-11-16  8:30 Mikle Kolyada
2015-10-19 22:29 Matt Thode
2015-10-19 16:04 Matt Thode
2015-09-29 14:52 Matt Thode
2015-09-28 17:35 Matt Thode
2015-09-28 17:14 Mikle Kolyada
2015-09-28 10:12 Agostino Sarubbo
2015-09-08  1:29 Matt Thode
2015-09-05 20:33 Matt Thode
2015-09-02  3:55 Matt Thode
2015-08-26 15:05 Matt Thode

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox