net-analyzer/nam: Fix for bug #170655

Package-Manager: portage-2.1.2.2

4 files changed, 86 insertions, 15 deletions

diff --git a/net-analyzer/nam/ChangeLog b/net-analyzer/nam/ChangeLog
index ae63aaa5e002..26065e71b50c 100644
--- a/net-analyzer/nam/ChangeLog
+++ b/net-analyzer/nam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nam
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.12 2007/02/20 00:13:12 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.13 2007/03/18 16:57:03 cedk Exp $
+
+*nam-1.11-r1 (18 Mar 2007)
+
+  18 Mar 2007; Cedric Krier <cedk@gentoo.org> +nam-1.11-r1.ebuild:
+  Fix for bug #170655 and some ebuild improve
 
   20 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/net-analyzer/nam/Manifest b/net-analyzer/nam/Manifest
index 3ab27f3f9ea0..b2fc98d036fb 100644
--- a/net-analyzer/nam/Manifest
+++ b/net-analyzer/nam/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nam-1.11-gcc4.patch 1422 RMD160 98d520cd897a17dd72f6a03cc1492d1326f6147f SHA1 e2c1e107c1a6363da5d1b26e5d926f12b992162b SHA256 3409938e99d069585d05a9c90c9efed57120ee31f9f4ffb45ed788a555d5b7d7
 MD5 89a234e9bd80e8a8586443c4576495fa files/nam-1.11-gcc4.patch 1422
 RMD160 98d520cd897a17dd72f6a03cc1492d1326f6147f files/nam-1.11-gcc4.patch 1422
@@ -12,14 +9,18 @@ EBUILD nam-1.10.ebuild 1663 RMD160 cdccd611e52cc1537ee38c8d975668b9829b5dce SHA1
 MD5 24a7a01ea9eefea3eacd19bc3bfb7939 nam-1.10.ebuild 1663
 RMD160 cdccd611e52cc1537ee38c8d975668b9829b5dce nam-1.10.ebuild 1663
 SHA256 c21a25d3e70f32ea04071676eb2ad7acfdb5e4f9117d27fa2d844e224a542f7a nam-1.10.ebuild 1663
+EBUILD nam-1.11-r1.ebuild 1503 RMD160 4b28b3c288655d263d469ffccfb00d35c2170503 SHA1 98ffb0209f6dee21d227aed80061e67720691a74 SHA256 2b3303065b3543a891fcc05b5601d96fbf854adc3a50feb70d76ab9e02ee159e
+MD5 58c5f7e600da2e4f63b15d64b8cf7400 nam-1.11-r1.ebuild 1503
+RMD160 4b28b3c288655d263d469ffccfb00d35c2170503 nam-1.11-r1.ebuild 1503
+SHA256 2b3303065b3543a891fcc05b5601d96fbf854adc3a50feb70d76ab9e02ee159e nam-1.11-r1.ebuild 1503
 EBUILD nam-1.11.ebuild 1931 RMD160 aa8a3c7ba8c0c37959bfb1feb1ef54c3582f4c33 SHA1 f6716275e9337bc3a735cb410643134d7676604c SHA256 b9ab1dca733359b7c74088573e3154d60df755cc23de87337f918d2de73cca4d
 MD5 9c33a02d86c5f3cc59708090a37aeb5e nam-1.11.ebuild 1931
 RMD160 aa8a3c7ba8c0c37959bfb1feb1ef54c3582f4c33 nam-1.11.ebuild 1931
 SHA256 b9ab1dca733359b7c74088573e3154d60df755cc23de87337f918d2de73cca4d nam-1.11.ebuild 1931
-MISC ChangeLog 1664 RMD160 1643efe5c1c402ad9a0dee7e5b6975843976ce17 SHA1 0e284bd9434328917d03fd0702c428edaba9914c SHA256 ad595edb9d2522eff1ebaec9545ec59a37d2b5fe3c2582ad3ca031e7101efdb4
-MD5 e8b17865b56ea0ff91c59456d684d2c4 ChangeLog 1664
-RMD160 1643efe5c1c402ad9a0dee7e5b6975843976ce17 ChangeLog 1664
-SHA256 ad595edb9d2522eff1ebaec9545ec59a37d2b5fe3c2582ad3ca031e7101efdb4 ChangeLog 1664
+MISC ChangeLog 1805 RMD160 3231ffff8f1f991180b265f48d0c6a3e78f67077 SHA1 14c8cb6a5bd71e7982361cf074e981d84775b32b SHA256 86a7d395360b3ac76bce860cb1fee24c894d5f6690c15b6467b5242feba2d827
+MD5 7d9335cf8da6d4033ab524c5c675dd6c ChangeLog 1805
+RMD160 3231ffff8f1f991180b265f48d0c6a3e78f67077 ChangeLog 1805
+SHA256 86a7d395360b3ac76bce860cb1fee24c894d5f6690c15b6467b5242feba2d827 ChangeLog 1805
 MISC metadata.xml 288 RMD160 a37ae1172d23a4c30803b4fa2bd74fce23af4e4b SHA1 aefecf1c06a74ea5c33123dbb2658d469c993ad1 SHA256 168371dabfe95f599ab0c90586c74aa2926c065c9d13e908a1f233447555f634
 MD5 6b109ed0e1e524d761857815053fd679 metadata.xml 288
 RMD160 a37ae1172d23a4c30803b4fa2bd74fce23af4e4b metadata.xml 288
@@ -30,10 +31,6 @@ SHA256 89cbbeca45a5c3aee6a4464b5c7b8297d8cc874ff4e17a42560ae4e1499f70c7 files/di
 MD5 c387119f92aa3b12d73304b94e21e2b2 files/digest-nam-1.11 455
 RMD160 83bd03d990285bd441e4aa3b5195822ebf9894ef files/digest-nam-1.11 455
 SHA256 f62cd5ae358542811709723ce835ded5d0c6189e5965996613a29cb87ec2b084 files/digest-nam-1.11 455
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF2j0bz974XjDVpbkRAldQAJ4iXanTD8KRjnpx6y1kutK4giKeEQCgjM6Q
-p21ErTuv4zNgKiuHf8KV5sg=
-=eL1e
------END PGP SIGNATURE-----
+MD5 c387119f92aa3b12d73304b94e21e2b2 files/digest-nam-1.11-r1 455
+RMD160 83bd03d990285bd441e4aa3b5195822ebf9894ef files/digest-nam-1.11-r1 455
+SHA256 f62cd5ae358542811709723ce835ded5d0c6189e5965996613a29cb87ec2b084 files/digest-nam-1.11-r1 455
diff --git a/net-analyzer/nam/files/digest-nam-1.11-r1 b/net-analyzer/nam/files/digest-nam-1.11-r1
new file mode 100644
index 000000000000..851c0ef9f24e
--- /dev/null
+++ b/net-analyzer/nam/files/digest-nam-1.11-r1
@@ -0,0 +1,6 @@
+MD5 4f242d98f924f6e66edbd05f256e8fa5 nam-1.11.patch 681
+RMD160 e57babbf4621453985607269d66cd771df5b768d nam-1.11.patch 681
+SHA256 cdb5639ff6df6084290e737fd4a778a2d7c65cf45e3bb07b3363981618832ccd nam-1.11.patch 681
+MD5 2627e85637d7ae8caf477d4e76b6f5e0 nam-src-1.11.tar.gz 4358578
+RMD160 0b2c2550018a67b4081d5799a91d9964b4f731c8 nam-src-1.11.tar.gz 4358578
+SHA256 64d5f8e048d42e98a4c41af34355ac576d58718cb66a52d710ebdb9abb495919 nam-src-1.11.tar.gz 4358578
diff --git a/net-analyzer/nam/nam-1.11-r1.ebuild b/net-analyzer/nam/nam-1.11-r1.ebuild
new file mode 100644
index 000000000000..2f94b982b961
--- /dev/null
+++ b/net-analyzer/nam/nam-1.11-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.11-r1.ebuild,v 1.1 2007/03/18 16:57:03 cedk Exp $
+
+inherit eutils
+
+DESCRIPTION="Network Simulator GUI for NS"
+HOMEPAGE="http://www.isi.edu/nsnam/nam"
+MY_P="${PN}-src-${PV}"
+SRC_URI_BASE="http://www.isi.edu/nsnam/dist/"
+SRC_URI="${SRC_URI_BASE}/${MY_P}.tar.gz
+	${SRC_URI_BASE}/${P}.patch"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-amd64 ~ppc ~sparc ~x86"
+IUSE="debug"
+DEPEND="|| ( x11-libs/libXmu virtual/x11 )
+	>=dev-lang/tcl-8.4.4
+	>=dev-lang/tk-8.4.4
+	>=dev-tcltk/otcl-1.0.8a
+	>=dev-tcltk/tclcl-1.0.13b
+	debug? ( dev-tcltk/tcl-debug )"
+RDEPEND=">=net-analyzer/ns-2.27
+	${DEPEND}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	EPATCH_OPTS="-d ${S} -p0" epatch "${DISTDIR}"/${P}.patch
+	# bug 137053
+	epatch "${FILESDIR}"/${PN}-1.11-gcc4.patch
+}
+
+src_compile() {
+	local tclver=$(best_version ">=dev-lang/tcl-8.4.4")
+	einfo "Using ${tclver}"
+
+	local tkver=$(best_version ">=dev-lang/tk-8.4.4")
+	einfo "Using ${tkver}"
+
+	econf \
+		--mandir=/usr/share/man \
+		--enable-release \
+		--with-tcl-ver=${tclver:13} \
+		--with-tk-ver=${tkver:12} \
+		$(use_enable debug) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	doman nam.1
+
+	dohtml CHANGES.html TODO.html
+	dodoc FILES VERSION README
+	for i in iecdemos edu ex; do
+		docinto ${i}
+		dodoc ${i}/*
+	done
+}