commit: d48697f8eca1f8d87030577c15cd1c4f1b0597a8
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 3 00:33:34 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov 4 23:37:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48697f8
net-analyzer/pnp4nagios: drop USE=icinga2 in a new revision.
Now that pnp4nagios doesn't rely on the localstatedir of Nagios or
Icinga, the two implementations of Icinga are actually suitable for an
"or" dependency. We therefore do away with USE=icinga2, and let
USE=icinga mean "either icinga or icinga2."
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-analyzer/pnp4nagios/metadata.xml | 7 ++-----
...np4nagios-0.6.26-r7.ebuild => pnp4nagios-0.6.26-r8.ebuild} | 11 +++++------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/net-analyzer/pnp4nagios/metadata.xml
b/net-analyzer/pnp4nagios/metadata.xml
index d5799ab49c9..6612bb05751 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -11,11 +11,8 @@
Build against <pkg>net-analyzer/nagios-core</pkg> (the default)
</flag>
<flag name="icinga">
- Build against <pkg>net-analyzer/icinga</pkg> instead of
- <pkg>net-analyzer/nagios-core</pkg>
- </flag>
- <flag name="icinga2">
- Build against <pkg>net-analyzer/icinga2</pkg> instead of
+ Build against <pkg>net-analyzer/icinga2</pkg> or
+ <pkg>net-analyzer/icinga</pkg> instead of
<pkg>net-analyzer/nagios-core</pkg>
</flag>
</use>
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
similarity index 91%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
index 4057b829d9e..8d5fdbcf842 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r7.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r8.ebuild
@@ -9,10 +9,10 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-IUSE="apache2 icinga icinga2 +nagios"
+IUSE="apache2 icinga +nagios"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-REQUIRED_USE="^^ ( icinga icinga2 nagios )"
+REQUIRED_USE="^^ ( icinga nagios )"
# Some things (sync mode, for one) are broken with nagios-4.x, but since
# nagios-3.x has been end-of-life'd, we don't have much choice here but
@@ -20,8 +20,7 @@ REQUIRED_USE="^^ ( icinga icinga2 nagios )"
DEPEND="
dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
net-analyzer/rrdtool[graph,perl]
- icinga? ( net-analyzer/icinga )
- icinga2? ( net-analyzer/icinga2 )
+ icinga? ( || ( net-analyzer/icinga2 net-analyzer/icinga ) )
nagios? ( net-analyzer/nagios-core )"
# A list of modules used in our Apache config file.
@@ -39,7 +38,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" )
src_configure() {
local user_group=nagios
- ( use icinga || use icinga2 ) && user_group=icinga
+ use icinga && user_group=icinga
econf \
--sysconfdir="${EPREFIX}"/etc/pnp \
@@ -75,7 +74,7 @@ src_install() {
# The nagios or icinga user needs to write performance data to the
# perfdata-dir...
local user_group=nagios
- ( use icinga || use icinga2 ) && user_group=icinga
+ use icinga && user_group=icinga
fowners "${user_group}:${user_group}" /var/lib/pnp/{,perfdata,spool}
# and likewise for its logs...
