fix depend.apache usage wrt #208584

Package-Manager: portage-2.1.4

11 files changed, 60 insertions, 39 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index 35a1a5f09593..23d61e7b9192 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/bugzilla
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.105 2007/12/10 16:46:49 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.106 2008/02/05 15:20:39 hollow Exp $
+
+  05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> bugzilla-2.20.5.ebuild,
+  bugzilla-2.22.3.ebuild:
+  fix depend.apache usage wrt #208584
 
   10 Dec 2007; Raúl Porcel <armin76@gentoo.org> bugzilla-3.0.2.ebuild:
   alpha/ia64/sparc stable wrt #198075
diff --git a/www-apps/bugzilla/bugzilla-2.20.5.ebuild b/www-apps/bugzilla/bugzilla-2.20.5.ebuild
index 2d5b89f2b0eb..02fdf0101dca 100644
--- a/www-apps/bugzilla/bugzilla-2.20.5.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.20.5.ebuild
@@ -1,8 +1,8 @@
-# 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/www-apps/bugzilla/bugzilla-2.20.5.ebuild,v 1.7 2007/10/15 15:09:53 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.5.ebuild,v 1.8 2008/02/05 15:20:39 hollow Exp $
 
-inherit webapp
+inherit webapp depend.apache
 
 DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
@@ -17,7 +17,6 @@ RDEPEND="
 	>=dev-lang/perl-5.6.1
 	postgres? ( >=dev-perl/DBD-Pg-1.43 )
 	mysql? ( <=dev-perl/DBD-mysql-3.0002 )
-	>=www-servers/apache-2.0
 	graphviz? ( media-gfx/graphviz )
 	>=dev-perl/AppConfig-1.52
 	>=virtual/perl-CGI-2.93
@@ -40,6 +39,8 @@ RDEPEND="
 	virtual/mta
 "
 
+need_apache2
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/www-apps/bugzilla/bugzilla-2.22.3.ebuild b/www-apps/bugzilla/bugzilla-2.22.3.ebuild
index 10e3a4d93240..e6b1244fd6f0 100644
--- a/www-apps/bugzilla/bugzilla-2.22.3.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.22.3.ebuild
@@ -1,8 +1,8 @@
-# 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/www-apps/bugzilla/bugzilla-2.22.3.ebuild,v 1.6 2007/09/04 18:19:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.22.3.ebuild,v 1.7 2008/02/05 15:20:39 hollow Exp $
 
-inherit webapp
+inherit webapp depend.apache
 
 DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
@@ -17,7 +17,6 @@ RDEPEND="
 	>=dev-lang/perl-5.6.1
 	postgres? ( >=dev-perl/DBD-Pg-1.45 )
 	mysql? ( >=dev-perl/DBD-mysql-3.0007 )
-	>=www-servers/apache-2.0
 	graphviz? ( media-gfx/graphviz )
 	>=dev-perl/AppConfig-1.52
 	>=virtual/perl-CGI-2.93
@@ -46,6 +45,8 @@ RDEPEND="
 "
 # dev-util/patchutils needed for interdiff
 
+need_apache2
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/www-apps/coppermine/ChangeLog b/www-apps/coppermine/ChangeLog
index e1b6919022c6..7a34b5932b94 100644
--- a/www-apps/coppermine/ChangeLog
+++ b/www-apps/coppermine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/coppermine
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.20 2007/12/02 14:54:18 wrobel Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.21 2008/02/05 15:16:37 hollow Exp $
+
+  05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> coppermine-1.4.14.ebuild:
+  fix depend.apache usage wrt #208584
 
 *coppermine-1.4.14 (02 Dec 2007)
 
diff --git a/www-apps/coppermine/coppermine-1.4.14.ebuild b/www-apps/coppermine/coppermine-1.4.14.ebuild
index 5496623f9060..81bfbb9bd41f 100644
--- a/www-apps/coppermine/coppermine-1.4.14.ebuild
+++ b/www-apps/coppermine/coppermine-1.4.14.ebuild
@@ -1,8 +1,8 @@
-# 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/www-apps/coppermine/coppermine-1.4.14.ebuild,v 1.1 2007/12/02 14:54:18 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/coppermine-1.4.14.ebuild,v 1.2 2008/02/05 15:16:37 hollow Exp $
 
-inherit webapp versionator depend.php
+inherit webapp versionator depend.php depend.apache
 
 MY_PV=$(delete_all_version_separators)
 DESCRIPTION="Feature rich web picture gallery script written in PHP using GD or ImageMagick lib with a MySQL backend."
@@ -15,10 +15,11 @@ IUSE="imagemagick"
 
 DEPEND="app-arch/unzip"
 
-RDEPEND=">=www-servers/apache-2.0
-	virtual/httpd-php
+RDEPEND="virtual/httpd-php
 	imagemagick? ( media-gfx/imagemagick )"
 
+need_apache2
+
 S=${WORKDIR}/cpg$(delete_all_version_separators)
 
 pkg_setup() {
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 5d1677b766bf..4ae17438ffbf 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.133 2008/01/23 16:51:37 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.134 2008/02/05 15:13:28 hollow Exp $
+
+  05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> gallery-1.5.3.ebuild,
+  gallery-1.5.5.ebuild, gallery-1.5.7.ebuild:
+  fix depend.apache usage wrt #208584
 
 *gallery-1.5.7 (23 Jan 2008)
 
diff --git a/www-apps/gallery/gallery-1.5.3.ebuild b/www-apps/gallery/gallery-1.5.3.ebuild
index 859bbf70bbfe..0a5c91a83686 100644
--- a/www-apps/gallery/gallery-1.5.3.ebuild
+++ b/www-apps/gallery/gallery-1.5.3.ebuild
@@ -1,8 +1,8 @@
-# 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/www-apps/gallery/gallery-1.5.3.ebuild,v 1.9 2007/07/29 17:27:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.3.ebuild,v 1.10 2008/02/05 15:13:28 hollow Exp $
 
-inherit webapp
+inherit webapp depend.apache
 
 DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
 HOMEPAGE="http://gallery.sourceforge.net/"
@@ -12,14 +12,15 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="imagemagick netpbm unzip zip"
 
-RDEPEND=">=www-servers/apache-2.0
-	virtual/php
+RDEPEND="virtual/php
 	media-libs/jpeg
 	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
 	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
 	unzip? ( app-arch/unzip )
 	zip? ( app-arch/zip )"
 
+need_apache2
+
 S=${WORKDIR}/${PN}
 
 src_install() {
diff --git a/www-apps/gallery/gallery-1.5.5.ebuild b/www-apps/gallery/gallery-1.5.5.ebuild
index de756c7d1087..e330630ec3b5 100644
--- a/www-apps/gallery/gallery-1.5.5.ebuild
+++ b/www-apps/gallery/gallery-1.5.5.ebuild
@@ -1,8 +1,8 @@
-# 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/www-apps/gallery/gallery-1.5.5.ebuild,v 1.3 2007/07/29 17:27:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.5.ebuild,v 1.4 2008/02/05 15:13:28 hollow Exp $
 
-inherit webapp
+inherit webapp depend.apache
 
 DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
 HOMEPAGE="http://gallery.sourceforge.net/"
@@ -12,14 +12,15 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="imagemagick netpbm unzip zip"
 
-RDEPEND=">=www-servers/apache-2.0
-	virtual/php
+RDEPEND="virtual/php
 	media-libs/jpeg
 	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
 	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
 	unzip? ( app-arch/unzip )
 	zip? ( app-arch/zip )"
 
+need_apache2
+
 S=${WORKDIR}/${PN}
 
 src_install() {
diff --git a/www-apps/gallery/gallery-1.5.7.ebuild b/www-apps/gallery/gallery-1.5.7.ebuild
index 1cf99a26434f..312084a19a2c 100644
--- a/www-apps/gallery/gallery-1.5.7.ebuild
+++ b/www-apps/gallery/gallery-1.5.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.7.ebuild,v 1.1 2008/01/23 16:51:37 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.7.ebuild,v 1.2 2008/02/05 15:13:28 hollow Exp $
 
-inherit webapp
+inherit webapp depend.apache
 
 DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
 HOMEPAGE="http://gallery.sourceforge.net/"
@@ -12,8 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="imagemagick netpbm unzip zip"
 
-RDEPEND=">=www-servers/apache-2.0
-	virtual/httpd-cgi
+RDEPEND="virtual/httpd-cgi
 	virtual/php
 	media-libs/jpeg
 	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
@@ -21,6 +20,8 @@ RDEPEND=">=www-servers/apache-2.0
 	unzip? ( app-arch/unzip )
 	zip? ( app-arch/zip )"
 
+need_apache2
+
 S=${WORKDIR}/${PN}
 
 src_install() {
diff --git a/www-apps/postfixadmin/ChangeLog b/www-apps/postfixadmin/ChangeLog
index 521cbd1bde47..08e6e13213ce 100644
--- a/www-apps/postfixadmin/ChangeLog
+++ b/www-apps/postfixadmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/postfixadmin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.8 2007/07/29 17:37:50 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.9 2008/02/05 15:10:24 hollow Exp $
+
+  05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> postfixadmin-2.1.0.ebuild:
+  fix depend.apache usage wrt #208584
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> postfixadmin-2.1.0.ebuild:
   Fixing SRC_URI since the old one is redirecting to sourceforge. Fixing the
diff --git a/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild b/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild
index 3f5fc64d8745..e69e5d883563 100644
--- a/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild
@@ -1,13 +1,13 @@
-# 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/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild,v 1.9 2007/07/29 17:37:50 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild,v 1.10 2008/02/05 15:10:24 hollow Exp $
 
 # Source: http://bugs.gentoo.org/show_bug.cgi?id=50035
 # Submitted-By: SteveB <tp22a@softhome.net>
 # Reviewed-By: wrobel 2005-12-14
-# $Id: postfixadmin-2.1.0.ebuild,v 1.9 2007/07/29 17:37:50 phreak Exp $
+# $Id: postfixadmin-2.1.0.ebuild,v 1.10 2008/02/05 15:10:24 hollow Exp $
 
-inherit eutils webapp
+inherit eutils webapp depend.apache
 
 IUSE="vhosts"
 DESCRIPTION="Postfix Admin is a Web Based Management tool for Postfix when you are dealing with Postfix Style Virtual Domains and Virtual Users that are stored in MySQL."
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="virtual/httpd-php
 		>=mail-mta/postfix-2.0.0
-		>=www-servers/apache-2.0
 		>=dev-lang/perl-5.0
 		dev-perl/DBI
 		dev-perl/DBD-mysql"
@@ -27,6 +26,8 @@ RDEPEND=">=sys-apps/sed-4.0.5
 		sys-apps/grep
 		sys-apps/findutils"
 
+need_apache2
+
 LICENSE="MPL-1.1"
 
 pkg_setup() {