Bump to 2.31

Package-Manager: portage-2.1.3.9

4 files changed, 150 insertions, 15 deletions

diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog
index fcf102c165f8..14ac420142ec 100644
--- a/net-analyzer/ns/ChangeLog
+++ b/net-analyzer/ns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ns
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.25 2007/07/26 13:34:36 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.26 2007/10/01 10:45:45 anant Exp $
+
+*ns-2.31 (01 Oct 2007)
+
+  01 Oct 2007; Anant Narayanan <anant@gentoo.org> +ns-2.31.ebuild:
+  Bump to 2.31
 
   26 Jul 2007; Anant Narayanan <anant@gentoo.org> metadata.xml:
   Add myself to metadata.
diff --git a/net-analyzer/ns/Manifest b/net-analyzer/ns/Manifest
index 001642979527..b8aeeb2139d8 100644
--- a/net-analyzer/ns/Manifest
+++ b/net-analyzer/ns/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ns-2.28-gentoo.diff 2199 RMD160 d9d133c0b77f7df1be0a37a28d309ceef55ac0d4 SHA1 87d49f7a85a09a8e1f08b7f26dadaa437e18005c SHA256 9632f6b55cdb10b49ea600d45e10c6657aefc40b2891781e07676453fecd1d0b
 MD5 a836c68ff4e3e7d53adf2ba91f47d626 files/ns-2.28-gentoo.diff 2199
 RMD160 d9d133c0b77f7df1be0a37a28d309ceef55ac0d4 files/ns-2.28-gentoo.diff 2199
@@ -10,14 +7,19 @@ MD5 eb38cb2673e8366474a72a9215c8fc5b files/ns-2.29-gcc41.patch 3440
 RMD160 67f49146447bab490edac48591ab148a5ec645de files/ns-2.29-gcc41.patch 3440
 SHA256 3c4b0559079fe7549329bebc3eef205f25448f508f5801152011145a36334d83 files/ns-2.29-gcc41.patch 3440
 DIST ns-src-2.29.tar.gz 55291146 RMD160 ff7b0b0cca62eb4f9657f913f56991f22fdfb5ce SHA1 2ea07fde01ff99b13e544974875f029be30f6250 SHA256 cd78c0eafb4f6f170c3ff9a3e3eace5ff43d1f2abbcb5b18cac67bfe3624bcad
+DIST ns-src-2.31.tar.gz 56719360 RMD160 ca8b17b241b25127859c89c79110f839982ca4b0 SHA1 095e0b599abb5b1c977320f435175e8d13487b7c SHA256 7cea6e80591be6331e8a158ab8a0d689d9e6f3ff4d9c11739af9bb5be5eaa166
 EBUILD ns-2.29.ebuild 3495 RMD160 eee61a3a76d8b44f813e84110030a8d01615cb06 SHA1 77cd95954ff8fbc22e93460279913236434084a5 SHA256 fbfad324418d0511f8033512bb438f9b694e4f009ee24c5a6570571d143740c1
 MD5 17dcd8dc44936fc8156842aac9be0349 ns-2.29.ebuild 3495
 RMD160 eee61a3a76d8b44f813e84110030a8d01615cb06 ns-2.29.ebuild 3495
 SHA256 fbfad324418d0511f8033512bb438f9b694e4f009ee24c5a6570571d143740c1 ns-2.29.ebuild 3495
-MISC ChangeLog 3301 RMD160 416cc3331d5de386154a3a1d2d2f64166213c71e SHA1 0a6fd5452b74ef3c50b940c66311a0f236f8dcfc SHA256 8020766f2097a4a06d5f7b8ea910b8c462b9a24d786260e5e2a914f53ba8e114
-MD5 b674b5bb02573ce09d99042c3900f55a ChangeLog 3301
-RMD160 416cc3331d5de386154a3a1d2d2f64166213c71e ChangeLog 3301
-SHA256 8020766f2097a4a06d5f7b8ea910b8c462b9a24d786260e5e2a914f53ba8e114 ChangeLog 3301
+EBUILD ns-2.31.ebuild 3430 RMD160 1f0aae2b76772c28d5ccc85a1862ef062e57fa10 SHA1 0bc2cf31d8eca9c00715cbf979a51a9bbe509dbf SHA256 02b94cb43d6783c149cb38caa127f7cf0b7e1925486a475a3a557da14e56a250
+MD5 b5cbf4df94e283dd1bea02585d641a38 ns-2.31.ebuild 3430
+RMD160 1f0aae2b76772c28d5ccc85a1862ef062e57fa10 ns-2.31.ebuild 3430
+SHA256 02b94cb43d6783c149cb38caa127f7cf0b7e1925486a475a3a557da14e56a250 ns-2.31.ebuild 3430
+MISC ChangeLog 3408 RMD160 7c68c4ed21d2fbd5eb96f4bbe61df5bf36ce46eb SHA1 16318bfd013712fd655b66050015e858d925a3f8 SHA256 5a3d80068df1cdf438293f456d7588a5d3f15d66e5fd0749432c9caa31bdc2af
+MD5 dda25b766843d4dbeeae5c8cac21e0a9 ChangeLog 3408
+RMD160 7c68c4ed21d2fbd5eb96f4bbe61df5bf36ce46eb ChangeLog 3408
+SHA256 5a3d80068df1cdf438293f456d7588a5d3f15d66e5fd0749432c9caa31bdc2af ChangeLog 3408
 MISC metadata.xml 277 RMD160 7e99672950524965694a535687eb8b7974970674 SHA1 b29bb00bd9d0ac818b72b7dfcc954742bf1c1e6a SHA256 929da7ca44f755e4ba1aaf2fea20455e4c0f9273c282eb948676e70d4859c6b2
 MD5 484082a931ab0a9bab1bed2eccc03873 metadata.xml 277
 RMD160 7e99672950524965694a535687eb8b7974970674 metadata.xml 277
@@ -25,10 +27,6 @@ SHA256 929da7ca44f755e4ba1aaf2fea20455e4c0f9273c282eb948676e70d4859c6b2 metadata
 MD5 1b0b85fdae448481af48ff0ba915d3a0 files/digest-ns-2.29 241
 RMD160 6075cf62bdc7d54245b8180144317f5ef5788f35 files/digest-ns-2.29 241
 SHA256 cf58c6e4eb7440c59a45d0ccd89d72998b3c31d721efc7807186ea17a5bf3849 files/digest-ns-2.29 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG4D1mz974XjDVpbkRAlRvAJ0WJMUgeq2EyIM8GT4QuDA+9VZeBwCgkDWn
-S9wjVRgd9QUuuGlh8SBhA6U=
-=Ze23
------END PGP SIGNATURE-----
+MD5 9a1e31f0093fdb9bfb21034831945354 files/digest-ns-2.31 241
+RMD160 7ed66970a4b90f2bdccd9bcad855d12b5839927e files/digest-ns-2.31 241
+SHA256 b6ef7f7a955936063c73d05e90e631de069ecb1d119b4fb225029b3a608e90ba files/digest-ns-2.31 241
diff --git a/net-analyzer/ns/files/digest-ns-2.31 b/net-analyzer/ns/files/digest-ns-2.31
new file mode 100644
index 000000000000..76b157560c00
--- /dev/null
+++ b/net-analyzer/ns/files/digest-ns-2.31
@@ -0,0 +1,3 @@
+MD5 32c7bc31d115d31f491d9179d21a8df5 ns-src-2.31.tar.gz 56719360
+RMD160 ca8b17b241b25127859c89c79110f839982ca4b0 ns-src-2.31.tar.gz 56719360
+SHA256 7cea6e80591be6331e8a158ab8a0d689d9e6f3ff4d9c11739af9bb5be5eaa166 ns-src-2.31.tar.gz 56719360
diff --git a/net-analyzer/ns/ns-2.31.ebuild b/net-analyzer/ns/ns-2.31.ebuild
new file mode 100644
index 000000000000..08e0d99b68ca
--- /dev/null
+++ b/net-analyzer/ns/ns-2.31.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.31.ebuild,v 1.1 2007/10/01 10:45:45 anant Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Network Simulator"
+HOMEPAGE="http://www.isi.edu/nsnam/ns/"
+SRC_URI="http://downloads.sourceforge.net/nsnam/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD as-is"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
+IUSE="doc debug"
+
+RDEPEND=">=dev-lang/tcl-8.4.5
+		>=dev-lang/tk-8.4.5
+		>=dev-tcltk/otcl-1.11
+		>=dev-tcltk/tclcl-1.17
+		virtual/libpcap
+		debug? (	=dev-lang/perl-5*
+					>=sci-visualization/xgraph-12.1
+					>=dev-libs/dmalloc-4.8.2
+					>=dev-tcltk/tcl-debug-2.0 )"
+DEPEND="${RDEPEND}
+		doc? (	virtual/tetex
+				virtual/ghostscript
+				dev-tex/latex2html )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed '/$(CC)/s!-g!$(CFLAGS)!g' ${S}/indep-utils/model-gen/Makefile
+}
+
+src_compile() {
+	local myconf
+	local mytclver=""
+	local i
+
+	tc-export CC CXX
+
+	# correctness is more important than speed
+	replace-flags -Os -O2
+	replace-flags -O3 -O2
+
+	use debug \
+		&& myconf="${myconf} --with-tcldebug=/usr/lib/tcldbg2.0" \
+		|| myconf="${myconf} --with-tcldebug=no"
+	myconf="${myconf} $(use_with debug dmalloc)"
+
+	for i in 8.4 ; do
+		einfo "Testing TCL ${i}"
+		has_version "=dev-lang/tcl-${i}*" && mytclver=${i}
+		[ "${#mytclver}" -gt 2 ] && break
+	done
+	einfo "Using TCL ${mytclver}"
+	myconf="${myconf} --with-tcl-ver=${mytclver} --with-tk-ver=${mytclver}"
+
+	econf \
+		${myconf} \
+		--mandir=/usr/share/man \
+		--enable-stl \
+		--enable-release || die "./configure failed"
+	emake CCOPT="${CFLAGS}" || die
+
+	cd ${S}/indep-utils/dosdbell
+	emake DFLAGS="${CFLAGS}" || die
+	cd ${S}/indep-utils/dosreduce
+	${CC} ${CFLAGS} dosreduce.c -o dosreduce
+	cd ${S}/indep-utils/propagation
+	${CXX} ${CXXFLAGS} threshold.cc -o threshold
+	cd ${S}/indep-utils/model-gen
+	emake CFLAGS="${CFLAGS}" || die
+
+	if useq doc; then
+		einfo "Generating extra docs"
+		cd ${S}/doc
+		yes '' | emake all
+	fi
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1 /usr/share/doc/${PF} /usr/share/ns
+	make DESTDIR="${D}" MANDEST=/usr/share/man install \
+		|| die "make install failed"
+	dobin nse
+
+	dodoc BASE-VERSION COPYRIGHTS FILES HOWTO-CONTRIBUTE README VERSION
+	dohtml CHANGES.html TODO.html
+
+	cd "${S}"
+	insinto /usr/share/ns
+	doins -r tcl
+
+	cd "${S}/indep-utils/dosdbell"
+	dobin dosdbell dosdbellasim
+	newdoc README README.dosdbell
+	cd "${S}/indep-utils/dosreduce"
+	dobin dosreduce
+	newdoc README README.dosreduce
+	cd "${S}/indep-utils/cmu-scen-gen"
+	dobin cbrgen.tcl
+	newdoc README README.cbrgen
+	cd "${S}/indep-utils/propagation"
+	dobin threshold
+	cd "${S}/indep-utils/model-gen"
+	dobin http_connect http_active
+
+	if use doc; then
+		cd ${S}/doc
+		docinto doc
+		dodoc everything.dvi everything.ps.gz everything.html everything.pdf
+		docinto model-gen
+		cd ${S}/indep-utils/model-gen
+		dodoc *
+	fi
+}
+
+src_test() {
+	einfo "Warning, these tests will take upwards of 45 minutes."
+	einfo "Additionally, as shipped, a number of tests may fail."
+	einfo "We log to 'validate.run', which you should compare against"
+	einfo "the shipped 'validate.out' to evaluate success."
+	einfo "At the time of assembling this ebuild, these test suites failed:"
+	einfo "srm smac-multihop hier-routing algo-routing mcast vc"
+	einfo "session mixmode webcache mcache plm wireless-tdma"
+	./validate 2>&1 | tee ${S}/validate.run
+}