[patch] patch - final version :)

acid-0.9.6_beta23.ebuild.diff (text/plain), 1.83 KB, created by Jakub Moc (RETIRED) on 2006-01-04 11:44:20 UTC

--- acid-0.9.6_beta23.ebuild	2005-09-09 01:35:48.000000000 +0200
+++ acid-0.9.6_beta23-r1.ebuild	2006-01-04 20:38:03.000000000 +0100
@@ -1,11 +1,11 @@
 # 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}
+MY_P="${P/_beta/b}"
+S="${WORKDIR}/${PN}"
 DESCRIPTION="Snort ACID - Analysis Console for Intrusion Databases"
 HOMEPAGE="http://acidlab.sourceforge.net"
 SRC_URI="http://acidlab.sourceforge.net/${MY_P}.tar.gz"
@@ -14,26 +14,25 @@
 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
-	media-libs/gd
-	=virtual/httpd-php-4*"
+# Note: jpgraph is an unstable package
+RDEPEND=">=dev-php/adodb-4.65-r1
+	dev-php4/jpgraph
+	media-libs/gd"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-pkg_setup() {
-	webapp_pkg_setup
+need_php4
+need_apache
 
-	need_php4
-	require_php_with_use gd session
+pkg_setup() {
+        webapp_pkg_setup
+        require_gd
+        require_php_with_use session
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i '12s:^$DBlib_path =.*:$DBlib_path = "/usr/lib/php/adodb";:' \
 		acid_conf.php || die "sed acid_conf.php failed"
 	sed -i '67s/($version\[0\] >= 4)/($version[0] >= 5) || &/' \
@@ -43,7 +42,7 @@
 src_install () {
 	webapp_src_preinst
 
-	insinto ${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
 	doins *
 
 	webapp_src_install