Modular X dependencies are fixed.

(Portage version: 2.0.53)

4 files changed, 18 insertions, 8 deletions

diff --git a/net-analyzer/sara/ChangeLog b/net-analyzer/sara/ChangeLog
index f37a2b646be6..9fd1315ee9f4 100644
--- a/net-analyzer/sara/ChangeLog
+++ b/net-analyzer/sara/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sara
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/ChangeLog,v 1.16 2006/01/09 22:15:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/ChangeLog,v 1.17 2006/01/20 19:26:40 pva Exp $
+
+  20 Jan 2006; Peter Volkov <pva@gentoo.org> sara-6.0.4.ebuild,
+  sara-6.0.7d.ebuild:
+  Modular X dependencies are fixed.
 
 *sara-6.0.7d (09 Jan 2006)
 
diff --git a/net-analyzer/sara/Manifest b/net-analyzer/sara/Manifest
index 9c9c83c9f3cf..33e96df4ca62 100644
--- a/net-analyzer/sara/Manifest
+++ b/net-analyzer/sara/Manifest
@@ -3,5 +3,5 @@ MD5 5c10df628bd8e993b404759fef5d70dc files/digest-sara-6.0.4 60
 MD5 e8a1965d072936eccafb53ed1018210c files/digest-sara-6.0.7d 61
 MD5 291ce83a97555c503a53904467cae289 files/sara 246
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 4d94863ed1540fcca8ba78e2bfb7875c sara-6.0.4.ebuild 3559
-MD5 8eee793cfb288b7eb41a62187cfce0d8 sara-6.0.7d.ebuild 3568
+MD5 b33ab92a37fba95834556f19146a2f46 sara-6.0.4.ebuild 3630
+MD5 894c2e6e8b6ad2a301ebff4cc3b32f89 sara-6.0.7d.ebuild 3639
diff --git a/net-analyzer/sara/sara-6.0.4.ebuild b/net-analyzer/sara/sara-6.0.4.ebuild
index 32144893b290..0bdf83a0512a 100644
--- a/net-analyzer/sara/sara-6.0.4.ebuild
+++ b/net-analyzer/sara/sara-6.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/sara-6.0.4.ebuild,v 1.2 2005/07/25 19:04:47 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/sara-6.0.4.ebuild,v 1.3 2006/01/20 19:26:40 pva Exp $
 
 DESCRIPTION="SARA Security Auditor's Research Assistant is a derived work of Security Administrator Tool for Analyzing Networks SATAN"
 SRC_URI="http://www-arc.com/sara/downloads/${P}.tgz"
@@ -15,10 +15,13 @@ IUSE="X"
 DEPEND=">=dev-lang/perl-5.8 \
 	>=app-shells/tcsh-6.12
 	net-misc/netkit-rsh
+	app-arch/sharutils
 	net-misc/netkit-fingerd
 	net-analyzer/nmap
 	net-ftp/ftp
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libX11
+				x11-proto/xproto )
+			virtual/x11 ) )"
 
 SARA_HOME=/opt/sara
 
diff --git a/net-analyzer/sara/sara-6.0.7d.ebuild b/net-analyzer/sara/sara-6.0.7d.ebuild
index 6bfb15a09e9a..ca4808b7e1a4 100644
--- a/net-analyzer/sara/sara-6.0.7d.ebuild
+++ b/net-analyzer/sara/sara-6.0.7d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/sara-6.0.7d.ebuild,v 1.1 2006/01/09 22:15:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/sara-6.0.7d.ebuild,v 1.2 2006/01/20 19:26:40 pva Exp $
 
 DESCRIPTION="SARA Security Auditor's Research Assistant is a derived work of Security Administrator Tool for Analyzing Networks SATAN"
 SRC_URI="http://www-arc.com/sara/downloads/${P}.tgz"
@@ -15,10 +15,13 @@ IUSE="X"
 DEPEND=">=dev-lang/perl-5.8 \
 	>=app-shells/tcsh-6.12
 	net-misc/netkit-rsh
+	app-arch/sharutils
 	net-misc/netkit-fingerd
 	net-analyzer/nmap
 	net-ftp/ftp
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libX11
+				x11-proto/xproto )
+			virtual/x11 ) )"
 
 SARA_HOME=/opt/sara