fix depend.apache usage wrt #208584

Package-Manager: portage-2.1.4

8 files changed, 54 insertions, 33 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/Manifest b/sci-misc/boinc/Manifest
index 13d45245b1d7..8d50ee7dd1eb 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 08_all_Makefile.patch 792 RMD160 b2126e243dc1c7b49e44740e67fe9b3b2aa9e6c3 SHA1 581132deec4ec3b305f8343aa4a12132e59d8e97 SHA256 bbbd219ac38491e0afb3d58d4a29eda79a30fdf4eed3f46cf18b66ce25f0b6df
 AUX boinc-4.72.20050813-gcc4-fix.patch 315 RMD160 5dab42ab983a65f604379129778ceb998709d35c SHA1 a0962070649c9de2b03f422cb94fcc4f29161f64 SHA256 33a51d973482e8f912ce702e95e074c864b45ca5e8a0224f5c591e3d06e39fe6
 AUX boinc-5.2.14-gcc-4.1.patch 433 RMD160 8ba92e4c8220fe3fd3bce8bb1bdbb6005b341b26 SHA1 3563ffd4227e32a9944b4dd785615cb47a6f1638 SHA256 44b584967c066def876976950366a9e26bb4763f1a48fb165df2aa9f27d4ae0e
@@ -10,11 +13,18 @@ DIST boinc-5.4.11.tar.bz2 9604328 RMD160 5dc29d9720ca3bff6015991fbabe97929b4b1fb
 DIST boinc-5.5.6.tar.bz2 9211643 RMD160 f1fc9405184146bce972002332b6271ab6940849 SHA1 ca51c621306d42a9a09e5949f9e86a2af1102267 SHA256 a23b01016c3c6664ad1ec21b8731a4a2648b47a8ceac8bcc13f09f86af017194
 DIST boinc-5.8.15.tar.bz2 3544744 RMD160 cdeb0a544be911db3f1d505f6cd9eb7c8a4971cb SHA1 924af911f22ca175c78614a9da9177e430a9a61e SHA256 0e428af6a76dd41786f15c9de0a31a403613b2e366c0f5b950e2be266f82b902
 DIST boinc_public-cvs-2005-08-13.tar.gz 6054534 RMD160 2585effd13c1b6e093141dbc34bebd770c6041be SHA1 3c76cb8b00ad7e26fe05cfacfe135fd2fbaeb99d SHA256 3a8b7f3d462a0fa5f1d0ad14c77f790a3cf12b1237a09636cd82b9bfefc2afb7
-EBUILD boinc-4.72.20050813-r3.ebuild 2381 RMD160 ba808f490d8d3317a1a0bd79568859602d9d83ff SHA1 69c7a3a54f80cc4d982aea26b0ac8347fb86bcc5 SHA256 2182cf09fcd236f6f569e3db6f29b40fc5fd92b5ef57ceb8ac2d2480fb5702ad
-EBUILD boinc-5.10.28.ebuild 3254 RMD160 2aa023b748e59d9eacc29ea08f218bea8ee8897e SHA1 57e5ff9a31a556bc2b0387aaa2fde5425bca14e3 SHA256 0af9f9f9b6407d981aa0e2215c70291a55b144fd477830eae7af8c85797dd191
-EBUILD boinc-5.2.14.ebuild 2838 RMD160 8e014e3c973b3cfbee10709274a0db3355d8a713 SHA1 a0eefc68ed227f30be26dd6ab20fcf0fe07ab169 SHA256 2027c512410c391f1007b5caa7a768ca57861c7b7c86fcf5d5fce0dec74d0cd7
-EBUILD boinc-5.4.11.ebuild 2828 RMD160 3472379d420e1c2be7cc43870e5f5b2f9349e205 SHA1 3514e21cfc4b1bd3606bfb0d07bd564a3ac210b4 SHA256 e28a3ea0823416a6dc5f8b42c29919c7bd31bef4525d3b1fd1ca018c1dbba24f
-EBUILD boinc-5.5.6.ebuild 3061 RMD160 62507ae09a1caddb9f5ae75619088e8b9573a481 SHA1 1290ded5649213fdeb60c1ad2adfeab346823ad2 SHA256 0188195be5a80b8f14bef61d76267c06c2bd378b9a34eec3b2be82b0efc02911
-EBUILD boinc-5.8.15.ebuild 3247 RMD160 1aef58cd676a578916ee6283ee6be3ef617edca8 SHA1 51ca2189d8c4ab3adf699d6d9cadc5af55ee458e SHA256 1776fe361478dd3f24e1b9a82223826fc4c434f049432887dad130990d103909
-MISC ChangeLog 7349 RMD160 66b61ab630835364feaa7982b08001da34457907 SHA1 f24adc60e26495ecda249552efaff39cb010c5ba SHA256 c6380ab41a3bb10e88ab99883534e562ad3cd8b1c7a963e68f25ab2a3bf65391
+EBUILD boinc-4.72.20050813-r3.ebuild 2394 RMD160 697d6efb6d32e202101b960a52be0f0f4c550e64 SHA1 e8496f361181092a608d6acc30d9f9190d344341 SHA256 d5e94183a5cc9cb74397653c74cc7e462f80e3fbc833f890476f83d961b56cae
+EBUILD boinc-5.10.28.ebuild 3267 RMD160 00f267f908c9ad40e88c0a46bb49c2d621326d2a SHA1 79fd94e3b8b94abb30579eedc162e4726baa6e19 SHA256 0d398bcb9ea78fa0a16e3e721830cd1cb379503b2523e59825b5cb5ba25cedb6
+EBUILD boinc-5.2.14.ebuild 2851 RMD160 de344024483c2dcb5c176b09f573187a4a9ff4a6 SHA1 fb8af31cc97e086316895024313d248db7ffb836 SHA256 fcb14481791d98b7d0f09fa67efd88c49dee4753f48b63a359bb1c49acac8f2a
+EBUILD boinc-5.4.11.ebuild 2841 RMD160 3363f7d8fb7571f470a9988c5045e24845ee69cd SHA1 144625e11735911b7579625a7b9e59707e3692b5 SHA256 5516db2729591cb0425c36fee88a979b643a7b3bbe2b89cf38965e4a2535214a
+EBUILD boinc-5.5.6.ebuild 3074 RMD160 c3552cd8a0694921792629debba1f5248a26ad34 SHA1 6f8dd89c90eaef0f8430d589c9c535e5b25d6323 SHA256 d2bf33d42e5f4d952275a44ff5804c943b8ce17a0e65d87fdd02284b45ccb022
+EBUILD boinc-5.8.15.ebuild 3260 RMD160 882057492e1ed36a3d89cafd0d1edf45a8efa18e SHA1 c7761c2e45d5ac503033a2b8fa56c9bcdbc8a9df SHA256 1224a7110ccbec86801b69a02d2aeff7655ee4efe3a0d99ab0908c6615524bea
+MISC ChangeLog 7578 RMD160 de5ba90eb05eca9769e108dbe3e511630ea5f3d9 SHA1 28419fc2e7219d62d33a81383f87b1dacd0975fa SHA256 33446ab106c11561a8a8d5d9ecaee33eb641e117cb078f5ddefd1d406cd2afc5
 MISC metadata.xml 420 RMD160 ebfdfbe98b4616e68514dece1809bae66cb1d354 SHA1 2f2b723edf9a8b6d20c595d966dba7fc51674313 SHA256 166699fb3c8d9d6a371af9275ac5d9198d354042a5b4e4377247e4639a6fb085
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeogpsACgkQmPFBzbX68WGPiwCghn0zBgg3bXkYDFhIuEtNyRZ+
+cBMAoIHVRM55CQcxow+K58RThQEn+vsK
+=gy3c
+-----END PGP SIGNATURE-----
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}"