Call depend.apache_pkg_setup() in pkg_setup() (bug #268371).

Package-Manager: portage-13625-svn/cvs/Linux x86_64

12 files changed, 50 insertions, 20 deletions

diff --git a/net-analyzer/aimsniff/ChangeLog b/net-analyzer/aimsniff/ChangeLog
index 7897b5333d96..4f23484797ea 100644
--- a/net-analyzer/aimsniff/ChangeLog
+++ b/net-analyzer/aimsniff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/aimsniff
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.32 2009/04/27 21:44:29 patrick Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.33 2009/05/26 17:03:02 arfrever Exp $
+
+  26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  aimsniff-0.9-r1.ebuild, aimsniff-0.9-r2.ebuild:
+  Call depend.apache_pkg_setup() in pkg_setup() (bug #268371).
 
   27 Apr 2009; Patrick Lauer <patrick@gentoo.org> aimsniff-0.9-r2:
   Adding RDEPEND again, fixes #262149
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
index e87044f49476..00e378f09ca3 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.18 2008/10/21 06:53:13 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.19 2009/05/26 17:03:02 arfrever Exp $
 
 inherit eutils webapp depend.apache
 
@@ -35,6 +35,8 @@ RESTRICT="mirror"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+	depend.apache_pkg_setup http
+
 	if use http
 	then
 		webapp_pkg_setup
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild b/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild
index e44dadfc8e10..47e17c74c009 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild,v 1.12 2009/04/27 21:44:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild,v 1.13 2009/05/26 17:03:02 arfrever Exp $
 
 EAPI="2"
 
@@ -38,6 +38,8 @@ RESTRICT="mirror"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+	depend.apache_pkg_setup http
+
 	if use http
 	then
 		webapp_pkg_setup
diff --git a/net-analyzer/base/ChangeLog b/net-analyzer/base/ChangeLog
index a539e6f9c830..f7ccfd764a2f 100644
--- a/net-analyzer/base/ChangeLog
+++ b/net-analyzer/base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/base
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.19 2008/11/21 11:43:25 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.20 2009/05/26 17:03:47 arfrever Exp $
+
+  26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  base-1.4.0.ebuild, base-1.4.1.ebuild:
+  Call depend.apache_pkg_setup() in pkg_setup() (bug #268371).
 
   21 Nov 2008; Peter Volkov <pva@gentoo.org> base-1.4.1.ebuild:
   Added dependencies on PEAR-Mail{,_Mime}, bug #247611, thank Dan Coats for
diff --git a/net-analyzer/base/base-1.4.0.ebuild b/net-analyzer/base/base-1.4.0.ebuild
index b5fcfb8448a9..b87c15d9e971 100644
--- a/net-analyzer/base/base-1.4.0.ebuild
+++ b/net-analyzer/base/base-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.4.0.ebuild,v 1.1 2008/07/06 22:09:49 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.4.0.ebuild,v 1.2 2009/05/26 17:03:47 arfrever Exp $
 
 inherit webapp versionator eutils depend.apache depend.php
 
@@ -43,6 +43,7 @@ RDEPEND="${DEPEND}
 need_php5
 
 pkg_setup() {
+	depend.apache_pkg_setup
 	webapp_pkg_setup
 
 	# Set the group ownership for /etc/base/base_conf.php so it can be read by
diff --git a/net-analyzer/base/base-1.4.1.ebuild b/net-analyzer/base/base-1.4.1.ebuild
index 532cfe1b515f..38810cfe1898 100644
--- a/net-analyzer/base/base-1.4.1.ebuild
+++ b/net-analyzer/base/base-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.4.1.ebuild,v 1.4 2008/11/21 11:43:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.4.1.ebuild,v 1.5 2009/05/26 17:03:47 arfrever Exp $
 
 inherit webapp versionator eutils depend.apache depend.php
 
@@ -46,6 +46,7 @@ need_php5
 S="${WORKDIR}/${PN}-php4"
 
 pkg_setup() {
+	depend.apache_pkg_setup
 	webapp_pkg_setup
 
 	# Set the group ownership for /etc/base/base_conf.php so it can be read by
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 89af8a95634a..f2fbbba2a2ad 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.149 2009/03/08 11:26:58 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.150 2009/05/26 17:04:42 arfrever Exp $
+
+  26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  cacti-0.8.6j-r8.ebuild:
+  Call depend.apache_pkg_setup() in pkg_setup() (bug #268371).
 
 *cacti-0.8.7d (08 Mar 2009)
 
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild
index f5e8b32a5123..028673604f05 100644
--- a/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild,v 1.6 2008/02/25 19:24:32 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild,v 1.7 2009/05/26 17:04:42 arfrever Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -63,6 +63,7 @@ src_unpack() {
 }
 
 pkg_setup() {
+	depend.apache_pkg_setup
 	webapp_pkg_setup
 	has_php
 	if [ $PHP_VERSION = 5 ] ; then
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 9b09bfee58ce..d038cc67832a 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-core
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.146 2009/05/15 16:29:29 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.147 2009/05/26 17:05:27 arfrever Exp $
+
+  26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  nagios-core-2.12.ebuild, nagios-core-3.0.6-r1.ebuild,
+  nagios-core-3.1.0.ebuild:
+  Call depend.apache_pkg_setup() in pkg_setup() (bug #268371).
 
   15 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   nagios-core-2.12.ebuild, nagios-core-3.0.6-r1.ebuild,
diff --git a/net-analyzer/nagios-core/nagios-core-2.12.ebuild b/net-analyzer/nagios-core/nagios-core-2.12.ebuild
index 3681d5686037..6f437fe6b9e1 100644
--- a/net-analyzer/nagios-core/nagios-core-2.12.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.12.ebuild,v 1.7 2009/05/15 16:29:29 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.12.ebuild,v 1.8 2009/05/26 17:05:27 arfrever Exp $
 
 EAPI="1"
 
@@ -32,6 +32,8 @@ want_apache2
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	depend.apache_pkg_setup
+
 	# Check if gd has been compiled with jpeg and png support
 	if use web; then
 		if ! built_with_use media-libs/gd jpeg png; then
diff --git a/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild b/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild
index bb475513372f..19f7c65d601a 100644
--- a/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.0.6-r1.ebuild,v 1.7 2009/05/15 16:29:29 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild,v 1.8 2009/05/26 17:05:27 arfrever Exp $
 
 EAPI="1"
 
@@ -31,6 +31,8 @@ want_apache2
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	depend.apache_pkg_setup
+
 	# Check if gd has been compiled with jpeg and png support
 	if use web; then
 		if ! built_with_use media-libs/gd jpeg png; then
diff --git a/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild b/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
index a4ae97e9a45a..ea5da8520224 100644
--- a/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.1.0.ebuild,v 1.4 2009/05/15 16:29:29 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild,v 1.5 2009/05/26 17:05:27 arfrever Exp $
 
 EAPI="2"
 
@@ -30,6 +30,8 @@ want_apache2
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	depend.apache_pkg_setup
+
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /var/nagios/home nagios
 }