Removed snort dep since its possible to run snort on a different box (bug 82359); also cleaned up the ebuild: use built_with_use() instead of the homegrown check_useflag(); moved sed's to src_unpack() where they belong.

(Portage version: 2.0.51.16)

3 files changed, 30 insertions, 44 deletions

diff --git a/net-analyzer/acid/ChangeLog b/net-analyzer/acid/ChangeLog
index 9cdebe9e37c4..c308dac3a65a 100644
--- a/net-analyzer/acid/ChangeLog
+++ b/net-analyzer/acid/ChangeLog
@@ -1,6 +1,11 @@
 # 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.7 2004/11/04 12:33:13 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.8 2005/02/18 10:45:28 ka0ttic Exp $
+
+  18 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> acid-0.9.6_beta23.ebuild:
+  Removed snort dep since its possible to run snort on a different box (bug
+  82359); also cleaned up the ebuild: use built_with_use() instead of the
+  homegrown check_useflag(); moved sed's to src_unpack() where they belong.
 
   04 Nov 2004; Eldad Zack <eldad@gentoo.org> acid-0.9.6_beta23.ebuild:
   PHP 5 Compatability fixes. Thanks to Christian Malerbakken
diff --git a/net-analyzer/acid/Manifest b/net-analyzer/acid/Manifest
index 25b376d0feb8..bb81bf3c33bf 100644
--- a/net-analyzer/acid/Manifest
+++ b/net-analyzer/acid/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 232980e34db9e7d2f69b8c5d641a74a6 acid-0.9.6_beta23.ebuild 1884
-MD5 ef65b7db5576ee68cda895e6f20c99dc ChangeLog 1409
+MD5 6c0460e396fb2b4277f30fce7e2d01c2 acid-0.9.6_beta23.ebuild 1817
+MD5 afb7c1520eb650da6a74f3ef40063f20 ChangeLog 1711
 MD5 d5e9bd932b7a02f7fbaa05865d864854 metadata.xml 248
 MD5 26f34d01017d5c8acb2d58fd139cef67 files/digest-acid-0.9.6_beta23 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBiiDtT+MN7JbqCpMRAj5WAJ4/gdSGTbcoLGQE59I+tcDuJcO10gCfUmzZ
-OBqk9j97D+1H9UYKEMVSYrI=
-=q8fz
------END PGP SIGNATURE-----
diff --git a/net-analyzer/acid/acid-0.9.6_beta23.ebuild b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
index b5eab1cbeb9e..126a824c6773 100644
--- a/net-analyzer/acid/acid-0.9.6_beta23.ebuild
+++ b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
@@ -1,65 +1,56 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.8 2004/11/04 12:33:13 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.9 2005/02/18 10:45:28 ka0ttic Exp $
 
 inherit webapp versionator eutils
 
 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"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
-
 IUSE="apache2"
-S=${WORKDIR}/${PN}
 
 # Note: jpgraph is an unstable package
-DEPEND="apache2? ( >=net-www/apache-2 )
+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
-	net-analyzer/snort"
-
-check_useflag() {
-	local my_pkg=$(best_version ${1})
-	local my_flag=${2}
-
-	if [[ $(grep -wo ${my_flag} /var/db/pkg/${my_pkg}/USE) ]]
-	then
-		return 0
-	fi
-
-	eerror "${my_pkg} was compiled without ${my_flag}. Please re-emerge it with USE=${my_flag}"
-	die "check_useflag failed"
-}
+	dev-php/mod_php"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 pkg_setup() {
 	webapp_pkg_setup
 
-	check_useflag dev-php/mod_php gd
+	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 mod_php)
-	ver_modphp=${ver_modphp/dev-php\/mod_php-/}
-	if [[ $(get_major_version ${ver_modphp}) -ge 5 ]]; then
-		check_useflag dev-php/mod_php session
+	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
 }
 
-src_compile () {
-	einfo "Nothing to compile."
+src_unpack() {
+	unpack ${A}
+	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) || &/' \
+		acid_db_common.php || die "sed acid_db_common.php failed"
 }
 
 src_install () {
 	webapp_src_preinst
 
-	sed -i -e '12s:^$DBlib_path =.*:$DBlib_path = "/usr/lib/php/adodb";:' acid_conf.php
-	sed -i -e '67s/($version\[0\] >= 4)/($version[0] >= 5) || &/' acid_db_common.php
-
 	insinto ${MY_HTDOCSDIR}
 	doins *