summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEldad Zack <eldad@gentoo.org>2004-10-11 23:10:52 +0000
committerEldad Zack <eldad@gentoo.org>2004-10-11 23:10:52 +0000
commita689e1d04548fe922f00134e322a18103cdbd557 (patch)
tree1e7423b2b41ce395be54031c182d850e56e3657f /net-analyzer/acid
parentAdded selinux to IUSE and removed old ebuild versions (Manifest recommit) (diff)
downloadgentoo-2-a689e1d04548fe922f00134e322a18103cdbd557.tar.gz
gentoo-2-a689e1d04548fe922f00134e322a18103cdbd557.tar.bz2
gentoo-2-a689e1d04548fe922f00134e322a18103cdbd557.zip
deps (#63441), sed typo (#64164).
Diffstat (limited to 'net-analyzer/acid')
-rw-r--r--net-analyzer/acid/ChangeLog8
-rw-r--r--net-analyzer/acid/acid-0.9.6_beta23.ebuild17
2 files changed, 22 insertions, 3 deletions
diff --git a/net-analyzer/acid/ChangeLog b/net-analyzer/acid/ChangeLog
index 408b254ddaac..2730692162f1 100644
--- a/net-analyzer/acid/ChangeLog
+++ b/net-analyzer/acid/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/acid
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.3 2004/07/31 08:39:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.4 2004/10/11 23:10:52 eldad Exp $
+
+ 12 Oct 2004; Eldad Zack <eldad@gentoo.org> acid-0.9.6_beta23.ebuild:
+ Added deps media-libs/gd and dev-php/mod_php. Added a check to see if mod_php
+ was emerged with USE=gd, and bail if not. Closes bug #63441. Thanks to
+ Benjamin Smee (strerror) <ben@disciplina.net>. Fixed typo in sedding. Closes
+ #64164. Thanks to Jakub Moc <jakub.moc@seznam.cz>.
31 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
acid-0.9.6_beta23.ebuild:
diff --git a/net-analyzer/acid/acid-0.9.6_beta23.ebuild b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
index 361ae32093b2..0512dde4808f 100644
--- a/net-analyzer/acid/acid-0.9.6_beta23.ebuild
+++ b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.4 2004/09/04 18:55:05 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.5 2004/10/11 23:10:52 eldad Exp $
inherit webapp
@@ -20,8 +20,21 @@ DEPEND="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
net-analyzer/snort"
+pkg_setup() {
+ # Check if mod_php was emerged with GD
+ my_modphp=$(best_version dev-php/mod_php)
+
+ if [[ ! $(grep -wo gd /var/db/pkg/${my_modphp}/USE) ]];
+ then
+ eerror "${my_modphp} was compiled without gd support. Please reemerge it with USE=gd."
+ die "pkg_setup failed"
+ fi
+}
+
src_compile () {
einfo "Nothing to compile."
}
@@ -29,7 +42,7 @@ src_compile () {
src_install () {
webapp_src_preinst
- sed -i -e '12s:^$DBlib_path =.*:$DBlib_path = "/usr/lib/php/adodb":' acid_conf.php
+ sed -i -e '12s:^$DBlib_path =.*:$DBlib_path = "/usr/lib/php/adodb";:' acid_conf.php
insinto ${MY_HTDOCSDIR}
doins *