summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanagiotis Christopoulos <pchrist@gentoo.org>2015-01-27 14:58:15 +0000
committerPanagiotis Christopoulos <pchrist@gentoo.org>2015-01-27 14:58:15 +0000
commit9070f96b28a1050aafe021c9a1a3a42ac4a5643d (patch)
tree02e7ff92f8ed99907307891b361840fd8548832e /net-analyzer
parentsci-libs/shogun: Fix typo in PYTHON_COMPAT, #537980 (diff)
downloadgentoo-2-9070f96b28a1050aafe021c9a1a3a42ac4a5643d.tar.gz
gentoo-2-9070f96b28a1050aafe021c9a1a3a42ac4a5643d.tar.bz2
gentoo-2-9070f96b28a1050aafe021c9a1a3a42ac4a5643d.zip
Better USE=-web handling for 3.5.1, fixes bug #537974, btw the whole -web thing needs improvement
(Portage version: 2.2.15/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nagios-core/ChangeLog9
-rw-r--r--net-analyzer/nagios-core/nagios-core-3.5.1.ebuild9
2 files changed, 13 insertions, 5 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 8da6c1b33aba..b4559288359b 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-analyzer/nagios-core
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.202 2014/12/13 18:13:54 zlogene Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.203 2015/01/27 14:58:15 pchrist Exp $
+
+ 27 Jan 2015; Panagiotis Christopoulos <pchrist@gentoo.org>
+ nagios-core-3.5.1.ebuild:
+ Better USE=-web handling for 3.5.1, fixes bug #537974, btw the whole -web
+ thing needs improvement
13 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> -nagios-core-3.2.3.ebuild,
-nagios-core-3.3.1.ebuild:
diff --git a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
index e3fdcab76e1a..174a4b187e76 100644
--- a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild,v 1.8 2014/09/19 10:30:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild,v 1.9 2015/01/27 14:58:15 pchrist Exp $
EAPI=5
@@ -95,6 +95,7 @@ src_install() {
if ! use web ; then
sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
+ -e 's/$(MAKE) install-exfoliation/# line removed due missing web use flag/' \
Makefile
fi
@@ -103,7 +104,9 @@ src_install() {
emake DESTDIR="${D}" install
emake DESTDIR="${D}" install-config
emake DESTDIR="${D}" install-commandmode
- emake DESTDIR="${D}" install-classicui
+ if use web; then
+ emake DESTDIR="${D}" install-classicui
+ fi
newinitd "${FILESDIR}"/nagios3 nagios
newconfd "${FILESDIR}"/conf.d nagios