bug 102825

(Portage version: 2.0.51.22-r2)

3 files changed, 14 insertions, 29 deletions

diff --git a/net-analyzer/acid/ChangeLog b/net-analyzer/acid/ChangeLog
index c09355c3f6e2..2143796181e7 100644
--- a/net-analyzer/acid/ChangeLog
+++ b/net-analyzer/acid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/acid
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.10 2005/03/29 12:05:49 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.11 2005/09/08 23:16:04 vanquirius Exp $
+
+  08 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  acid-0.9.6_beta23.ebuild:
+  Update dependency on virtual/http-php, see bug 102825. Thanks to Jakub Moc
+  <jakub@gentoo.org> for his kind patch. TODO: test with php-5.
 
   29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> acid-0.9.6_beta23.ebuild:
   added ~amd64 to KEYWORDS, fixes #73861
diff --git a/net-analyzer/acid/Manifest b/net-analyzer/acid/Manifest
index abe4c2b5ea43..caf347cf92d9 100644
--- a/net-analyzer/acid/Manifest
+++ b/net-analyzer/acid/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 99dd16851b817739a75fd0f516c0e5af acid-0.9.6_beta23.ebuild 1438
 MD5 fc015b47ac1f99ab01027e593ed779e6 ChangeLog 2067
-MD5 6f6a775fc11cb6471984d0984f7723f6 acid-0.9.6_beta23.ebuild 1826
-MD5 26f34d01017d5c8acb2d58fd139cef67 files/digest-acid-0.9.6_beta23 65
 MD5 d5e9bd932b7a02f7fbaa05865d864854 metadata.xml 248
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0BqSI1lqEGTUzyQRAma8AKCQ8oK0tS+faHNXSYIXpkNYoe6ugACffVdb
-VAIL+0PpWvvjGPfSLLugyPg=
-=cTM3
------END PGP SIGNATURE-----
+MD5 26f34d01017d5c8acb2d58fd139cef67 files/digest-acid-0.9.6_beta23 65
diff --git a/net-analyzer/acid/acid-0.9.6_beta23.ebuild b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
index fa1a212882eb..ac7487f37513 100644
--- a/net-analyzer/acid/acid-0.9.6_beta23.ebuild
+++ b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
@@ -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.12 2005/07/09 18:41:59 swegener Exp $
+# $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 $
 
-inherit webapp versionator eutils
+inherit webapp versionator eutils depend.php
 
 MY_P=${P/_beta/b}
 S=${WORKDIR}/${PN}
@@ -14,29 +14,21 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="apache2"
 
-# Note: jpgraph is an unstable package
+# 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
 	media-libs/gd
-	=dev-php/mod_php-4*"
+	=virtual/httpd-php-4*"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 pkg_setup() {
 	webapp_pkg_setup
 
-	built_with_use dev-php/mod_php gd || \
-		die "dev-php/mod_php must be built with USE=gd"
-
-	# If mod_php used is >= 5.0.0, it has to have session useflag enabled.
-	local ver_modphp=$(best_version dev-php/mod_php)
-	ver_modphp="${ver_modphp/dev-php\/mod_php-/}"
-	if [[ $(get_major_version ${ver_modphp}) -ge 5 ]] ; then
-		built_with_use dev-php/mod_php session || \
-			die "dev-php/mod_php must be built with USE=session"
-	fi
+	need_php4
+	require_php_with_use gd session
 }
 
 src_unpack() {
@@ -60,9 +52,7 @@ src_install () {
 pkg_postinst() {
 	webapp_pkg_postinst
 
-	einfo
 	einfo "Note: ACID is installed as a webapp."
 	einfo "The ACID database is an extension of the SNORT database."
 	einfo "To setup the ACID database look in the README"
-	einfo
 }