fix #39423, revision bump.

5 files changed, 134 insertions, 6 deletions

diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog
index 08fcc0410d42..e14ffbaf881b 100644
--- a/net-analyzer/ns/ChangeLog
+++ b/net-analyzer/ns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ns
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.4 2004/01/22 08:30:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.5 2004/01/28 04:04:33 robbat2 Exp $
+
+*ns-2.27-r1 (27 Jan 2004)
+
+  27 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> ns-2.27-r1.ebuild,
+  ns-2.27.ebuild:
+  fix #39423, revision bump.
 
 *ns-2.27 (22 Jan 2004)
 
diff --git a/net-analyzer/ns/Manifest b/net-analyzer/ns/Manifest
index b9a04493f669..5c34aa572cfe 100644
--- a/net-analyzer/ns/Manifest
+++ b/net-analyzer/ns/Manifest
@@ -1,7 +1,9 @@
-MD5 de9264ca023e078f9c49175c428c24cd ns-2.27.ebuild 2386
+MD5 9d4e3b6efecfb1631eb61d419d184a36 ns-2.27-r1.ebuild 2912
+MD5 be37edef02fdbc0db18199a40434d600 ns-2.27.ebuild 2910
 MD5 8274586336fd5e66c5a9b1a4b786c8b8 ns-2.26-r1.ebuild 2070
 MD5 34efa95fa7271e9b0215b9b152a0fd24 ns-2.26.ebuild 1981
-MD5 fbf0db55e483e5fd792c6fc72733d636 ChangeLog 724
+MD5 34efe68802ba1b25456ae9a5f4a7ed2a ChangeLog 871
 MD5 e50216b9efeff43a6e4ccadbc249ab44 files/digest-ns-2.26-r1 65
+MD5 cbd46edc227114c8538b564b0bdf1ae6 files/digest-ns-2.27-r1 65
 MD5 e50216b9efeff43a6e4ccadbc249ab44 files/digest-ns-2.26 65
 MD5 cbd46edc227114c8538b564b0bdf1ae6 files/digest-ns-2.27 65
diff --git a/net-analyzer/ns/files/digest-ns-2.27-r1 b/net-analyzer/ns/files/digest-ns-2.27-r1
new file mode 100644
index 000000000000..7891800a531f
--- /dev/null
+++ b/net-analyzer/ns/files/digest-ns-2.27-r1
@@ -0,0 +1 @@
+MD5 db3a16e450f66a5e4dd881349ccc5dd7 ns-src-2.27.tar.gz 44642525
diff --git a/net-analyzer/ns/ns-2.27-r1.ebuild b/net-analyzer/ns/ns-2.27-r1.ebuild
new file mode 100644
index 000000000000..764f0684061c
--- /dev/null
+++ b/net-analyzer/ns/ns-2.27-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.27-r1.ebuild,v 1.1 2004/01/28 04:04:33 robbat2 Exp $
+
+DESCRIPTION="Network Simulator"
+HOMEPAGE="http://www.isi.edu/nsnam/ns/"
+SRC_URI="http://www.isi.edu/nsnam/dist/${PN}-src-${PV}.tar.gz"
+LICENSE="BSD as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc debug"
+need_tclver="8.4.4"
+valid_tclver="${need_tclver}"
+mytclver=""
+DEPEND_COMMON=">=dev-lang/tcl-${need_tclver}
+		>=dev-lang/tk-${need_tclver}
+		>=dev-tcltk/otcl-1.0.8a
+		>=dev-tcltk/tclcl-1.0.13b
+		net-libs/libpcap
+		debug? ( =dev-lang/perl-5* >=media-gfx/xgraph-12.1 >=dev-libs/dmalloc-4.8.2 >=dev-tcltk/tcl-debug-2.0 )"
+DEPEND="doc? ( app-text/tetex virtual/ghostscript dev-tex/latex2html ) ${DEPEND_COMMON}"
+RDEPEND="${DEPEND_COMMON}"
+S=${WORKDIR}/${P}
+
+findtclver() {
+	# input should always be in INCREASING order
+	local ACCEPTVER="8.3 8.4"
+	[ -n "$*" ] && ACCEPTVER="$*"
+	for i in ${ACCEPTVER}; do
+		use debug && einfo "Testing TCL ${i}"
+		# we support being more specific
+		[ "$(#i)" = "3" ] && i="${i}*"
+		has_version ">=dev-lang/tcl-${i}" && mytclver=${i}
+	done
+	use debug && einfo "Using TCL ${mytclver}"
+	if [ -z "${mytclver}" ]; then
+		die "Unable to find a suitable version of TCL"
+	fi
+}
+
+src_compile() {
+	local myconf
+	use debug && myconf="${myconf} --with-tcldebug=/usr/lib/tcldbg2.0" || myconf="${myconf} --with-tcldebug=no"
+	myconf="${myconf} `use_with debug dmalloc`"
+	local mytclver=""
+	for i in 8.4 8.3; 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
+	gcc ${CFLAGS} dosreduce.c -o dosreduce
+	cd ${S}/indep-utils/propagation
+	g++ ${CXXFLAGS} threshold.cc -o threshold
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	make DESTDIR=${D} MANDEST=/usr/share/man install || die
+	dobin nse
+
+	dodoc BASE-VERSION COPYRIGHTS FILES HOWTO-CONTRIBUTE README VERSION
+	dohtml CHANGES.html TODO.html
+
+	cp -ra ${S}/ns-tutorial ${D}/usr/share/doc/${PF}
+	cp -ra ${S}/tcl ${D}/usr/share/ns
+
+	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
+
+	if use doc; then
+		einfo "Generating extra docs"
+		cd ${S}/doc
+		docinto doc
+		emake all
+		dodoc everything.dvi everything.ps.gz everything.html everything.pdf
+	fi
+}
diff --git a/net-analyzer/ns/ns-2.27.ebuild b/net-analyzer/ns/ns-2.27.ebuild
index 2b2c0c354c45..70db648a270e 100644
--- a/net-analyzer/ns/ns-2.27.ebuild
+++ b/net-analyzer/ns/ns-2.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.27.ebuild,v 1.1 2004/01/22 08:30:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.27.ebuild,v 1.2 2004/01/28 04:04:33 robbat2 Exp $
 
 DESCRIPTION="Network Simulator"
 HOMEPAGE="http://www.isi.edu/nsnam/ns/"
@@ -9,8 +9,11 @@ LICENSE="BSD as-is"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc debug"
-DEPEND_COMMON=">=dev-lang/tcl-8.3.2
-		>=dev-lang/tk-8.3.2
+need_tclver="8.4.4"
+valid_tclver="${need_tclver}"
+mytclver=""
+DEPEND_COMMON=">=dev-lang/tcl-${need_tclver}
+		>=dev-lang/tk-${need_tclver}
 		>=dev-tcltk/otcl-1.0.8a
 		>=dev-tcltk/tclcl-1.0.13b
 		net-libs/libpcap
@@ -19,6 +22,22 @@ DEPEND="doc? ( app-text/tetex app-text/ghostscript dev-tex/latex2html ) ${DEPEND
 RDEPEND="${DEPEND_COMMON}"
 S=${WORKDIR}/${P}
 
+findtclver() {
+	# input should always be in INCREASING order
+	local ACCEPTVER="8.3 8.4"
+	[ -n "$*" ] && ACCEPTVER="$*"
+	for i in ${ACCEPTVER}; do
+		use debug && einfo "Testing TCL ${i}"
+		# we support being more specific
+		[ "$(#i)" = "3" ] && i="${i}*"
+		has_version ">=dev-lang/tcl-${i}" && mytclver=${i}
+	done
+	use debug && einfo "Using TCL ${mytclver}"
+	if [ -z "${mytclver}" ]; then
+		die "Unable to find a suitable version of TCL"
+	fi
+}
+
 src_compile() {
 	local myconf
 	use debug && myconf="${myconf} --with-tcldebug=/usr/lib/tcldbg2.0" || myconf="${myconf} --with-tcldebug=no"