Fixed DEPEND issues, #62666

Package-Manager: portage-2.0.51-r15

3 files changed, 18 insertions, 24 deletions

diff --git a/net-analyzer/aimsniff/ChangeLog b/net-analyzer/aimsniff/ChangeLog
index 6d36533efb44..909d48cb0d1f 100644
--- a/net-analyzer/aimsniff/ChangeLog
+++ b/net-analyzer/aimsniff/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/aimsniff
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.13 2004/08/23 13:26:25 eldad Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.14 2005/02/24 00:23:48 port001 Exp $
+
+  24 Feb 2005; <port001@gentoo.org> aimsniff-0.9-r1.ebuild:
+  Fixed DEPEND issues, #62666
 
   23 Aug 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
   aimsniff-0.9-r1.ebuild:
diff --git a/net-analyzer/aimsniff/Manifest b/net-analyzer/aimsniff/Manifest
index 0b81b81f5933..f44db7152b23 100644
--- a/net-analyzer/aimsniff/Manifest
+++ b/net-analyzer/aimsniff/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 963a5d9c89cdedb10f576a7253b8ad00 aimsniff-0.9-r1.ebuild 3128
-MD5 819e26f4d9273c15023703087bfc1178 ChangeLog 1898
+MD5 f2fc3483085b40c6b63b86e65eade065 aimsniff-0.9-r1.ebuild 3192
+MD5 dbdd52a1e26d5511d14692b407941226 ChangeLog 1991
 MD5 eedbaff735e1d64aea7755d6d5c566a7 metadata.xml 372
 MD5 31171666587c48bf647abbddda0f9c91 files/digest-aimsniff-0.9-r1 125
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBjMztT+MN7JbqCpMRAlYbAJ4vh3vXxtQTHYvBCMtvON6IFS0RxwCfQEpC
-dvtV9lqBTXVU9eKmykNK7oU=
-=SfSy
------END PGP SIGNATURE-----
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
index 99501949ad34..afc40f93cb64 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/aimsniff/aimsniff-0.9-r1.ebuild,v 1.4 2004/08/23 13:26:25 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.5 2005/02/24 00:23:48 port001 Exp $
 
 inherit webapp
 
-IUSE="samba mysql apache2"
+IUSE="samba mysql apache2 http"
 
 MY_P="${P}d"
 WAS_VER="0.1.2b"
@@ -12,7 +12,7 @@ WAS_VER="0.1.2b"
 DESCRIPTION="Utility for monitoring and archiving AOL Instant Messenger messages across a network"
 HOMEPAGE="http://www.aimsniff.com/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	apache2? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
+	http? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
 
 RESTRICT="nomirror"
 
@@ -32,17 +32,18 @@ DEPEND=">=dev-lang/perl-5.8.4
 	dev-perl/DBI
 	dev-perl/Unix-Syslog
 	mysql? ( dev-db/mysql dev-perl/DBD-mysql )
-	samba? ( net-fs/samba )"
+	samba? ( net-fs/samba )
+	http? ( apache2? ( =net-www/apache-2* ) !apache2? ( =net-www/apache-1*) )"
 
 pkg_setup() {
-	if use apache2
+	if use http
 	then
 		webapp_pkg_setup
 	fi
 }
 
 src_install() {
-	if use apache2
+	if use http
 	then
 		webapp_src_preinst
 	fi
@@ -54,7 +55,7 @@ src_install() {
 	doins table.struct
 	dodoc README ChangeLog
 
-	if use apache2
+	if use http
 	then
 		cp ../was-${WAS_VER}/docs/README README.WAS
 		dodoc README.WAS
@@ -84,7 +85,7 @@ pkg_postinst() {
 		einfo "To create and enable the mysql database, please run: "
 		einfo "ebuild /var/db/pkg/net-analyzer/${P}/${P}.ebuild config"
 
-		if use apache2
+		if use http
 		then
 			echo "To create and enable the mysql database, please run:
 			ebuild /var/db/pkg/net-analyzer/${P}/${P}.ebuild config" > apache-postinst
@@ -92,7 +93,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if use apache2
+	if use http
 	then
 		echo
 		einfo "Go to http://${HOSTNAME}/was/admin.php to configure WAS."