--- acid-0.9.6_beta23.ebuild.orig	2005-09-09 01:35:48.000000000 +0200
+++ acid-0.9.6_beta23.ebuild	2005-09-19 14:03:53.000000000 +0200
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.13 2005/09/08 23:16:04 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.12 2005/07/09 18:41:59 swegener Exp $
 
-inherit webapp versionator eutils depend.php
+inherit webapp versionator eutils depend.php depend.apache
 
 MY_P=${P/_beta/b}
 S=${WORKDIR}/${PN}
@@ -14,20 +14,18 @@
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="apache2"
 
-# TODO: check for php-5 support
-RDEPEND="apache2? ( >=net-www/apache-2 )
-	!apache2? ( =net-www/apache-1* )
-	>=dev-php/adodb-4.0.5
-	>=dev-php/jpgraph-1.12.2
+# Note: jpgraph is an unstable package
+RDEPEND=">=dev-php/adodb-4.65-r1
+	dev-php4/jpgraph
 	media-libs/gd
-	=virtual/httpd-php-4*"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
+need_php4
+need_apache
+
 pkg_setup() {
 	webapp_pkg_setup
-
-	need_php4
 	require_php_with_use gd session
 }