summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-01-31 19:55:36 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-01-31 19:55:36 +0000
commit17da29cb2c4875265bf10c277002ce33a8db2d1d (patch)
treec552e0ac59e62fbfc3cb41e73391de868d6d90c3
parentDrop ppc-macos conditionals (diff)
downloadgentoo-2-17da29cb2c4875265bf10c277002ce33a8db2d1d.tar.gz
gentoo-2-17da29cb2c4875265bf10c277002ce33a8db2d1d.tar.bz2
gentoo-2-17da29cb2c4875265bf10c277002ce33a8db2d1d.zip
fix depend.apache usage wrt #208033
(Portage version: 2.1.4)
-rw-r--r--net-analyzer/nagios-core/ChangeLog6
-rw-r--r--net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild6
-rw-r--r--net-analyzer/nagios-core/nagios-core-1.4.1.ebuild6
-rw-r--r--net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild4
4 files changed, 13 insertions, 9 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 5c1e928d849a..d612d69d5361 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nagios-core
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.109 2008/01/21 20:28:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.110 2008/01/31 19:55:36 hollow Exp $
+
+ 31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> nagios-core-1.4.1.ebuild,
+ nagios-core-1.4.1-r1.ebuild, nagios-core-2.10-r1.ebuild:
+ fix depend.apache usage wrt #208033
21 Jan 2008; Raúl Porcel <armin76@gentoo.org> nagios-core-2.10-r1.ebuild:
sparc stable wrt #205335
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
index 73a499606d26..0f8e22c370cb 100644
--- a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.5 2007/11/25 13:53:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.6 2008/01/31 19:55:36 hollow Exp $
inherit eutils apache-module toolchain-funcs
@@ -176,7 +176,7 @@ src_install() {
# Apache Module
if use !noweb; then
- insinto ${APACHE2_MODULES_CONFDIR}
+ insinto ${APACHE_MODULES_CONFDIR}
doins ${FILESDIR}/99_nagios.conf
if use perl; then
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
index ad084aae9b1d..1034d74173cd 100644
--- a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.10 2007/11/25 13:53:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.11 2008/01/31 19:55:36 hollow Exp $
inherit eutils apache-module toolchain-funcs
@@ -176,7 +176,7 @@ src_install() {
# Apache Module
if use !noweb; then
- insinto ${APACHE2_MODULES_CONFDIR}
+ insinto ${APACHE_MODULES_CONFDIR}
doins ${FILESDIR}/99_nagios.conf
if use perl; then
diff --git a/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
index f3b9759b7a82..6afa18e72e5a 100644
--- a/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild,v 1.4 2008/01/21 20:28:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild,v 1.5 2008/01/31 19:55:36 hollow Exp $
inherit eutils apache-module toolchain-funcs
@@ -137,7 +137,7 @@ src_install() {
# Apache Module
if use !noweb; then
- insinto "${APACHE2_MODULES_CONFDIR}"
+ insinto "${APACHE_MODULES_CONFDIR}"
doins "${FILESDIR}"/99_nagios.conf
if use perl; then