Modular X dependencies are fixed.

(Portage version: 2.0.54)

5 files changed, 17 insertions, 13 deletions

diff --git a/net-analyzer/nam/ChangeLog b/net-analyzer/nam/ChangeLog
index a31039910e90..4b7ac53ac93c 100644
--- a/net-analyzer/nam/ChangeLog
+++ b/net-analyzer/nam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nam
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.8 2005/08/28 17:41:15 metalgod Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.9 2006/01/22 14:43:14 pva Exp $
+
+  22 Jan 2006; Peter Volkov <pva@gentoo.org> nam-1.10.ebuild,
+  nam-1.11.ebuild:
+  Modular X dependencies are fixed.
 
   28 Aug 2005; Luis Medinas <metalgod@gentoo.org> nam-1.11.ebuild:
   Added ~amd64 keywords. Closes bug #100863.
diff --git a/net-analyzer/nam/Manifest b/net-analyzer/nam/Manifest
index 0349a0af5758..7c982dd21002 100644
--- a/net-analyzer/nam/Manifest
+++ b/net-analyzer/nam/Manifest
@@ -1,6 +1,6 @@
 MD5 3bb510d0147c625941a210747e01209e ChangeLog 1111
-MD5 6b109ed0e1e524d761857815053fd679 metadata.xml 288
-MD5 648521ac4b84b0fd9a44dd738e2bd111 nam-1.10.ebuild 1644
-MD5 2b04c4565b5ac9b31d987d2a276d613d nam-1.11.ebuild 1851
 MD5 343bf4790e73307088d986e95861bb34 files/digest-nam-1.10 65
-MD5 09314cf87cf7fd7ce49916451d280c8c files/digest-nam-1.11 121
+MD5 7635a248c852a700c55ae059ebce1487 files/digest-nam-1.11 121
+MD5 6b109ed0e1e524d761857815053fd679 metadata.xml 288
+MD5 95df4a8bf5be1b58aed9016c9e12b6c8 nam-1.10.ebuild 1667
+MD5 cca4063c665023cc88604a67266de09a nam-1.11.ebuild 1874
diff --git a/net-analyzer/nam/files/digest-nam-1.11 b/net-analyzer/nam/files/digest-nam-1.11
index f305c1b7edd7..e2b160b727ab 100644
--- a/net-analyzer/nam/files/digest-nam-1.11
+++ b/net-analyzer/nam/files/digest-nam-1.11
@@ -1,2 +1,2 @@
-MD5 2627e85637d7ae8caf477d4e76b6f5e0 nam-src-1.11.tar.gz 4358578
 MD5 4f242d98f924f6e66edbd05f256e8fa5 nam-1.11.patch 681
+MD5 2627e85637d7ae8caf477d4e76b6f5e0 nam-src-1.11.tar.gz 4358578
diff --git a/net-analyzer/nam/nam-1.10.ebuild b/net-analyzer/nam/nam-1.10.ebuild
index 0ecfb213685c..e20eaca5cdd7 100644
--- a/net-analyzer/nam/nam-1.10.ebuild
+++ b/net-analyzer/nam/nam-1.10.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/nam/nam-1.10.ebuild,v 1.5 2005/02/13 22:27:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.10.ebuild,v 1.6 2006/01/22 14:43:14 pva Exp $
 
 DESCRIPTION="Network Simulator GUI for NS"
 HOMEPAGE="http://www.isi.edu/nsnam/${PN}/"
@@ -12,7 +12,7 @@ IUSE="debug"
 need_tclver="8.4.4"
 valid_tclver="${need_tclver}"
 mytclver=""
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libXmu virtual/x11 )
 		>=dev-lang/tcl-${need_tclver}
 		>=dev-lang/tk-${need_tclver}
 		>=dev-tcltk/otcl-1.0.8a
diff --git a/net-analyzer/nam/nam-1.11.ebuild b/net-analyzer/nam/nam-1.11.ebuild
index 11f3450ee497..ad2152c2592c 100644
--- a/net-analyzer/nam/nam-1.11.ebuild
+++ b/net-analyzer/nam/nam-1.11.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/nam/nam-1.11.ebuild,v 1.3 2005/08/28 17:41:15 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.11.ebuild,v 1.4 2006/01/22 14:43:14 pva Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE="debug"
 need_tclver="8.4.4"
 valid_tclver="${need_tclver}"
 mytclver=""
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libXmu virtual/x11 )
 		>=dev-lang/tcl-${need_tclver}
 		>=dev-lang/tk-${need_tclver}
 		>=dev-tcltk/otcl-1.0.8a