Version bump to ns-2.33 (upstream current). Verfied to work on sparc.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 138 insertions, 2 deletions

diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog
index ea270ab9e0e7..153e725abcb8 100644
--- a/net-analyzer/ns/ChangeLog
+++ b/net-analyzer/ns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ns
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.30 2009/03/20 20:19:14 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.31 2009/05/13 15:06:27 fmccor Exp $
+
+*ns-2.33 (13 May 2009)
+
+  13 May 2009; Ferris McCormick <fmccor@gentoo.org> +ns-2.33.ebuild:
+  Version bump to ns-2.33 (upstream current). Verfied to work on sparc.
 
   20 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/net-analyzer/ns/Manifest b/net-analyzer/ns/Manifest
index 61e4e08df9cf..4fa649a63196 100644
--- a/net-analyzer/ns/Manifest
+++ b/net-analyzer/ns/Manifest
@@ -1,4 +1,6 @@
+DIST ns-2.33.tar.gz 41649114 RMD160 54326b8ff4e63c0a9712c517c7ad4d9327a41d39 SHA1 0efd6aed45b504fcf3f125b0be00a60b87516a03 SHA256 2cdd803bc5afec9a60d514e619a1a9c3eaea4ae35e882891519f088ae7d2472b
 DIST ns-src-2.31.tar.gz 56719360 RMD160 ca8b17b241b25127859c89c79110f839982ca4b0 SHA1 095e0b599abb5b1c977320f435175e8d13487b7c SHA256 7cea6e80591be6331e8a158ab8a0d689d9e6f3ff4d9c11739af9bb5be5eaa166
 EBUILD ns-2.31.ebuild 3455 RMD160 92a69b410de6281bda7686fbc0fce78f48471d03 SHA1 afc271cccf4981450a8100fdcb648be98b23d2e5 SHA256 61ac3b566325a31a5d92e105e06c82073708e3557eae753a3d5afbd5e5d08ec3
-MISC ChangeLog 3966 RMD160 15a94bb88c2537317119dcc0cc466e0a30a0012d SHA1 88e7420f27530e39fc8dbe00bfadafcf786af069 SHA256 461f2ee6c1c7384f008d49f1cd5a4fe99aa28889d1304a7ddf77a1bbb2f48b57
+EBUILD ns-2.33.ebuild 3452 RMD160 2007f4085f2c7f601026ff435c042b169b89a6b9 SHA1 c80daba72ba6d83ed0971e295fe55be4639a298f SHA256 1efe0c3b85374ff3bc81f73d413c2e7eff3bf97ec30cb0c545bf3039c770c7e8
+MISC ChangeLog 4127 RMD160 e3ac6c436297c909a952b2ae35b4de57eaf155a9 SHA1 420393cf3f338b13113294d6edec7cba35603420 SHA256 0a0848380d9c64861291fa79bfa8e37606c618d17078673208bcd8836c605a4a
 MISC metadata.xml 216 RMD160 a071ecc87d28160585bd3f6216043959022706e4 SHA1 978abe58cec13db15ad7ca0215a6a7abb22b0734 SHA256 4de280682bb6a30e8a2bf5dd645d1dde1c6abbb7f3cfc1e2cfbedc388f679484
diff --git a/net-analyzer/ns/ns-2.33.ebuild b/net-analyzer/ns/ns-2.33.ebuild
new file mode 100644
index 000000000000..5aa2da59e25b
--- /dev/null
+++ b/net-analyzer/ns/ns-2.33.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.33.ebuild,v 1.1 2009/05/13 15:06:27 fmccor 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}-${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/latex-base
+				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"
+}