fix depend.apache usage wrt #208584

(Portage version: 2.1.4)

7 files changed, 37 insertions, 26 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 643c23315df2..25c5ae467884 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.36 2008/01/17 03:58:41 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.37 2008/02/05 15:36:38 hollow Exp $
+
+  05 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  boinc-4.72.20050813-r3.ebuild, boinc-5.2.14.ebuild, boinc-5.4.11.ebuild,
+  boinc-5.5.6.ebuild, boinc-5.8.15.ebuild, boinc-5.10.28.ebuild:
+  fix depend.apache usage wrt #208584
 
   17 Jan 2008; Joshua Jackson <tsunam@gentoo.org>
   +boinc-4.72.20050813-r3.ebuild, +boinc-5.2.14.ebuild,
diff --git a/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild b/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild
index b832cd3f0f80..4dcb9bb13605 100644
--- a/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild
+++ b/sci-misc/boinc/boinc-4.72.20050813-r3.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/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild,v 1.11 2008/01/17 03:58:41 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-4.72.20050813-r3.ebuild,v 1.12 2008/02/05 15:36:38 hollow Exp $
 
-inherit eutils wxwidgets
+inherit eutils wxwidgets depend.apache
 
 MY_PN="boinc_public-cvs"
 MY_PV="2005-08-13"
@@ -19,8 +19,7 @@ IUSE="server X"
 
 RDEPEND="sys-libs/zlib
 	X? ( =x11-libs/wxGTK-2.6* )
-	server? ( www-servers/apache
-		>=virtual/mysql-4.0
+	server? ( >=virtual/mysql-4.0
 		virtual/php
 		>=dev-lang/python-2.2.3
 		>=dev-python/mysql-python-0.9.2 )"
@@ -37,6 +36,8 @@ DEPEND=">=sys-devel/gcc-3.0.4
 	server? ( virtual/imap-c-client )
 	${RDEPEND}"
 
+want_apache server
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/sci-misc/boinc/boinc-5.10.28.ebuild b/sci-misc/boinc/boinc-5.10.28.ebuild
index 87432512d91f..8f3a190b05fd 100644
--- a/sci-misc/boinc/boinc-5.10.28.ebuild
+++ b/sci-misc/boinc/boinc-5.10.28.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/sci-misc/boinc/boinc-5.10.28.ebuild,v 1.1 2008/01/17 03:21:39 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.10.28.ebuild,v 1.2 2008/02/05 15:36:38 hollow Exp $
 
-inherit flag-o-matic wxwidgets
+inherit flag-o-matic wxwidgets depend.apache
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -17,8 +17,7 @@ RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.5
 	>=dev-libs/openssl-0.9.7
 	X? ( =x11-libs/wxGTK-2.6* )
-	server? ( www-servers/apache
-		>=virtual/mysql-4.0
+	server? ( >=virtual/mysql-4.0
 		virtual/php
 		>=dev-lang/python-2.2.3
 		>=dev-python/mysql-python-0.9.2 )"
@@ -37,6 +36,8 @@ DEPEND=">=sys-devel/gcc-3.0.4
 	server? ( virtual/imap-c-client )
 	${RDEPEND}"
 
+want_apache server
+
 src_unpack() {
 	unpack "${A}"
 	cd ""${S}""
diff --git a/sci-misc/boinc/boinc-5.2.14.ebuild b/sci-misc/boinc/boinc-5.2.14.ebuild
index 8c138ae6bcaf..430788c3b8ea 100644
--- a/sci-misc/boinc/boinc-5.2.14.ebuild
+++ b/sci-misc/boinc/boinc-5.2.14.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/sci-misc/boinc/boinc-5.2.14.ebuild,v 1.13 2008/01/17 03:58:41 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.2.14.ebuild,v 1.14 2008/02/05 15:36:38 hollow Exp $
 
-inherit eutils wxwidgets
+inherit eutils wxwidgets depend.apache
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -18,8 +18,7 @@ RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.0
 	>=dev-libs/openssl-0.9.7
 	X? ( =x11-libs/wxGTK-2.6* )
-	server? ( www-servers/apache
-		>=virtual/mysql-4.0
+	server? ( >=virtual/mysql-4.0
 		virtual/php
 		>=dev-lang/python-2.2.3
 		>=dev-python/mysql-python-0.9.2 )"
@@ -36,6 +35,8 @@ DEPEND=">=sys-devel/gcc-3.0.4
 	server? ( virtual/imap-c-client )
 	${RDEPEND}"
 
+want_apache server
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/sci-misc/boinc/boinc-5.4.11.ebuild b/sci-misc/boinc/boinc-5.4.11.ebuild
index de61068e7198..b9f102ff828b 100644
--- a/sci-misc/boinc/boinc-5.4.11.ebuild
+++ b/sci-misc/boinc/boinc-5.4.11.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/sci-misc/boinc/boinc-5.4.11.ebuild,v 1.8 2008/01/17 03:58:41 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.4.11.ebuild,v 1.9 2008/02/05 15:36:38 hollow Exp $
 
-inherit eutils wxwidgets
+inherit eutils wxwidgets depend.apache
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -17,8 +17,7 @@ RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.0
 	>=dev-libs/openssl-0.9.7
 	X? ( =x11-libs/wxGTK-2.6* )
-	server? ( www-servers/apache
-		>=virtual/mysql-4.0
+	server? ( >=virtual/mysql-4.0
 		virtual/php
 		>=dev-lang/python-2.2.3
 		>=dev-python/mysql-python-0.9.2 )"
@@ -37,6 +36,8 @@ DEPEND=">=sys-devel/gcc-3.0.4
 	server? ( virtual/imap-c-client )
 	${RDEPEND}"
 
+want_apache server
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/sci-misc/boinc/boinc-5.5.6.ebuild b/sci-misc/boinc/boinc-5.5.6.ebuild
index c35b0841eef9..1f7108a9cefb 100644
--- a/sci-misc/boinc/boinc-5.5.6.ebuild
+++ b/sci-misc/boinc/boinc-5.5.6.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/sci-misc/boinc/boinc-5.5.6.ebuild,v 1.11 2008/01/17 03:58:41 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.5.6.ebuild,v 1.12 2008/02/05 15:36:38 hollow Exp $
 
-inherit eutils wxwidgets
+inherit eutils wxwidgets depend.apache
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -17,8 +17,7 @@ RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.0
 	>=dev-libs/openssl-0.9.7
 	X? ( =x11-libs/wxGTK-2.6* )
-	server? ( www-servers/apache
-		>=virtual/mysql-4.0
+	server? ( >=virtual/mysql-4.0
 		virtual/php
 		>=dev-lang/python-2.2.3
 		>=dev-python/mysql-python-0.9.2 )"
@@ -37,6 +36,8 @@ DEPEND=">=sys-devel/gcc-3.0.4
 	server? ( virtual/imap-c-client )
 	${RDEPEND}"
 
+want_apache server
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/sci-misc/boinc/boinc-5.8.15.ebuild b/sci-misc/boinc/boinc-5.8.15.ebuild
index faf4ca4ec35b..63ac8e9ff2af 100644
--- a/sci-misc/boinc/boinc-5.8.15.ebuild
+++ b/sci-misc/boinc/boinc-5.8.15.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/sci-misc/boinc/boinc-5.8.15.ebuild,v 1.5 2008/01/17 03:21:39 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.8.15.ebuild,v 1.6 2008/02/05 15:36:38 hollow Exp $
 
-inherit flag-o-matic wxwidgets
+inherit flag-o-matic wxwidgets depend.apache
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -17,8 +17,7 @@ RDEPEND="sys-libs/zlib
 	>=net-misc/curl-7.15.5
 	>=dev-libs/openssl-0.9.7
 	X? ( =x11-libs/wxGTK-2.6* )
-	server? ( www-servers/apache
-		>=virtual/mysql-4.0
+	server? ( >=virtual/mysql-4.0
 		virtual/php
 		>=dev-lang/python-2.2.3
 		>=dev-python/mysql-python-0.9.2 )"
@@ -37,6 +36,8 @@ DEPEND=">=sys-devel/gcc-3.0.4
 	server? ( virtual/imap-c-client )
 	${RDEPEND}"
 
+want_apache server
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"