fix depend.apache usage wrt #208584

Package-Manager: portage-2.1.4

4 files changed, 22 insertions, 15 deletions

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() {