Bug #57737, new version from upstream.

(Portage version: 2.0.51.16)

7 files changed, 174 insertions, 14 deletions

diff --git a/sys-apps/tcng/ChangeLog b/sys-apps/tcng/ChangeLog
index ab87508a5d93..24cb513fd374 100644
--- a/sys-apps/tcng/ChangeLog
+++ b/sys-apps/tcng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/tcng
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/ChangeLog,v 1.9 2004/08/24 03:40:57 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/ChangeLog,v 1.10 2005/02/13 04:56:13 robbat2 Exp $
+
+*tcng-9m (12 Feb 2005)
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +tcng-9m.ebuild:
+  Bug #57737, new version from upstream.
 
   24 Aug 2004; Sven Wegener <swegener@gentoo.org> tcng-9h.ebuild,
   tcng-9i.ebuild, tcng-9l.ebuild:
diff --git a/sys-apps/tcng/Manifest b/sys-apps/tcng/Manifest
index 1ae63bafb613..8c8d78b268e3 100644
--- a/sys-apps/tcng/Manifest
+++ b/sys-apps/tcng/Manifest
@@ -1,11 +1,15 @@
+MD5 aadcc6d9edd906388a1915583d08bfcb tcng-9l.ebuild 4318
+MD5 da11449b9fdb5791f6bdf216fa7c43ab tcng-10b.ebuild 4796
+MD5 2cb6804cbc7b8d9ea3814e027f1e90a5 tcng-9i.ebuild 4032
+MD5 abba987a06285a5e0b7e9b6ed65bf3ed tcng-9m.ebuild 4409
+MD5 d70678f341abb71d3ff70121fa1d7b03 tcng-9h.ebuild 2508
 MD5 a2b8dfccae00ce0876d4e6e1de3c2e43 ChangeLog 1499
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-MD5 d70678f341abb71d3ff70121fa1d7b03 tcng-9h.ebuild 2508
-MD5 2cb6804cbc7b8d9ea3814e027f1e90a5 tcng-9i.ebuild 4032
-MD5 aadcc6d9edd906388a1915583d08bfcb tcng-9l.ebuild 4318
+MD5 055bee9ec58b1f245bee0772dda0b807 files/tcng-9i-gentoo.patch 410
+MD5 9b774d3673aca8103325fd1ed97f48db files/digest-tcng-10b 203
+MD5 801eefdefb3e7784dceff74052cd7a88 files/tcng-9l-fixes.patch 413
 MD5 1c8ca5acddcaf944dc6ea6c9e26f7e24 files/digest-tcng-9h 209
 MD5 bba07d9e3d5362bf04936fd2450b2d27 files/digest-tcng-9i 276
-MD5 95bc941a647639a523cea5fc6b8ae92a files/tcng-9i-fixes.patch 2949
-MD5 055bee9ec58b1f245bee0772dda0b807 files/tcng-9i-gentoo.patch 410
 MD5 ddfe867819ede95d01effbd33bedec14 files/digest-tcng-9l 276
-MD5 801eefdefb3e7784dceff74052cd7a88 files/tcng-9l-fixes.patch 413
+MD5 deae4e9275dbe0c488457ae9016c5df5 files/digest-tcng-9m 276
+MD5 95bc941a647639a523cea5fc6b8ae92a files/tcng-9i-fixes.patch 2949
diff --git a/sys-apps/tcng/files/digest-tcng-9m b/sys-apps/tcng/files/digest-tcng-9m
new file mode 100644
index 000000000000..839e91dd9967
--- /dev/null
+++ b/sys-apps/tcng/files/digest-tcng-9m
@@ -0,0 +1,4 @@
+MD5 636d382f6db917b385e7a6f158136ca2 tcng-9m.tar.gz 518416
+MD5 b05a4e375d9468be3a1dd3f0e83daee8 iproute2-2.4.7-now-ss010824.tar.gz 140139
+MD5 ac343233aa5d745341da9e4ec22475af iproute_20010824-11.diff.gz 44736
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
diff --git a/sys-apps/tcng/tcng-9h.ebuild b/sys-apps/tcng/tcng-9h.ebuild
index 3668ea69c2ac..3e135eb61fff 100644
--- a/sys-apps/tcng/tcng-9h.ebuild
+++ b/sys-apps/tcng/tcng-9h.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9h.ebuild,v 1.10 2004/08/24 03:40:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9h.ebuild,v 1.11 2005/02/13 04:56:13 robbat2 Exp $
 
 inherit eutils
 
diff --git a/sys-apps/tcng/tcng-9i.ebuild b/sys-apps/tcng/tcng-9i.ebuild
index 5755741a9f4f..88c2f8e869d1 100644
--- a/sys-apps/tcng/tcng-9i.ebuild
+++ b/sys-apps/tcng/tcng-9i.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9i.ebuild,v 1.8 2004/08/24 03:40:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9i.ebuild,v 1.9 2005/02/13 04:56:13 robbat2 Exp $
 
 inherit eutils
 
diff --git a/sys-apps/tcng/tcng-9l.ebuild b/sys-apps/tcng/tcng-9l.ebuild
index 1e56a84bccaa..2b37b2651bf6 100644
--- a/sys-apps/tcng/tcng-9l.ebuild
+++ b/sys-apps/tcng/tcng-9l.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9l.ebuild,v 1.8 2004/08/24 03:40:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9l.ebuild,v 1.9 2005/02/13 04:56:13 robbat2 Exp $
 
 inherit eutils
 
diff --git a/sys-apps/tcng/tcng-9m.ebuild b/sys-apps/tcng/tcng-9m.ebuild
new file mode 100644
index 000000000000..4acc66b23a2e
--- /dev/null
+++ b/sys-apps/tcng/tcng-9m.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9m.ebuild,v 1.1 2005/02/13 04:56:13 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="tcng - Traffic Control Next Generation"
+HOMEPAGE="http://tcng.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="debug doc tcsim"
+
+# perl because stuff is written in it
+# iproute,linux-atm as the output needs that
+# os-headers as it compiles stuff with them
+# gcc/binutils as it compiles stuff
+# tcsim does NOT compile with 2.6 headers
+DEPEND_COMMON="dev-lang/perl
+				sys-apps/iproute2
+				net-dialup/linux-atm
+				tcsim? ( !=sys-kernel/linux-headers-2.6* !sys-kernel/linux26-headers )
+				virtual/os-headers
+				sys-devel/gcc
+				sys-devel/binutils"
+
+DEPEND="doc? ( virtual/ghostscript virtual/tetex media-gfx/transfig )
+	sys-devel/make
+	dev-util/yacc
+	sys-devel/flex
+	${DEPEND_COMMON}"
+RDEPEND="sys-devel/gcc
+	tcsim? ( media-gfx/gnuplot )
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/gawk
+	sys-apps/coreutils
+	${DEPEND_COMMON}"
+
+IPROUTE_PN="iproute"
+IPROUTE_PV="20010824"
+IPROUTE_DEBIAN_PATCH_PV="11"
+IPROUTE_P="${IPROUTE_PN}-${IPROUTE_PV}"
+IPROUTE_DEBIAN_PATCH="${IPROUTE_P/-/_}-${IPROUTE_DEBIAN_PATCH_PV}.diff.gz"
+IPROUTE_SRCFILE="iproute2-2.4.7-now-ss${IPROUTE_PV/20}.tar.gz"
+
+# we also need a vanilla kernel source to use with this
+KERNEL_PN=linux
+KERNEL_PV=2.4.26
+KERNEL_P=${KERNEL_PN}-${KERNEL_PV}
+
+# note this project does NOT use the SF mirroring system
+SRC_URI="http://tcng.sourceforge.net/dist/${P}.tar.gz
+	tcsim? ( ftp://ftp.inr.ac.ru/ip-routing/${IPROUTE_SRCFILE}
+	mirror://debian/pool/main/i/iproute/${IPROUTE_DEBIAN_PATCH}
+	mirror://kernel/linux/kernel/v2.4/${KERNEL_P}.tar.bz2 )"
+
+S=${WORKDIR}/tcng
+IPROUTE_S=${WORKDIR}/${IPROUTE_P}
+KERNEL_S=${WORKDIR}/${KERNEL_P}
+
+src_unpack() {
+	# unpack tcng
+	unpack ${P}.tar.gz || die "failed to unpack tcng"
+	epatch ${FILESDIR}/${PN}-9l-fixes.patch
+	epatch ${FILESDIR}/${PN}-9i-gentoo.patch
+
+	for i in ${S}/tcsim/setup.*lib; do
+		sed -i 's/^mkdir /mkdir -p /g' ${i}
+	done
+
+	# add in the 2.4.26 kernel
+	sed -i '14iKVERSIONS=$KVERSIONS,2.4.26' ${S}/configure
+
+	if use tcsim; then
+		# unpack kernel
+		unpack ${KERNEL_P}.tar.bz2 || die "failed to unpack kernel"
+		ln -s ${KERNEL_S} ${S}/tcsim/linux || die "failed to unpack kernel"
+
+		# unpack iproute
+		unpack ${IPROUTE_SRCFILE} || die "failed to unpack iproute"
+		mv iproute2 iproute-20010824 || die "failed to unpack iproute"
+		epatch ${DISTDIR}/${IPROUTE_DEBIAN_PATCH}
+		# this is needed for tcsim
+		rm ${IPROUTE_S}/include-glibc/bits/socket.h || die "failed to unpack iproute"
+		cp -f ${IPROUTE_S}/include-glibc/socketbits.h ${IPROUTE_S}/include-glibc/bits/socket.h || die "failed to unpack iproute"
+		ln -s ${IPROUTE_S} ${S}/tcsim/iproute2 || die "failed to unpack iproute"
+	fi
+}
+
+src_compile() {
+	local myconf
+	if use tcsim; then
+		myconf="${myconf} --with-tcsim"
+		myconf="${myconf} --kernel ${KERNEL_S}"
+		myconf="${myconf} --iproute2 ${IPROUTE_S}"
+	else
+		myconf="${myconf} --no-tcsim"
+	fi
+
+	# i know this is before install stage, but the build needs it
+	dodir /usr/bin
+
+	# configure is NONSTANDARD
+	./configure \
+		--install-directory /usr \
+		--no-manual \
+		${myconf} \
+		|| die "configure failed"
+
+	# if we aren't debugging, an extra optimization is available
+	use debug || CFLAGS="${CFLAGS} -D__NO_STRING_INLINES"
+	# upstream package uses CFLAGS var for it's own uses
+	sed -i Common.make -e "s/^\(CC_OPTS=\)\(.*\)/\1${CFLAGS} #\2/"
+	unset CFLAGS
+	# tcsim fails to build in parallel make!
+	use tcsim && export MAKEOPTS="${MAKEOPTS} -j1"
+	emake || die
+	cd ${S}/doc
+	make tcng.txt
+	use doc && make tcng.pdf
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+
+	#For localization.sh to work corectly
+	#TCNG INSTALL/TOPDIR has to be /usr, instead of /var/tmp/portage/tcng-xx/image/usr...
+	sed 's:^\(INSTALL_DIR=\)\(.*\):\1$(DESTDIR)\2:g' -i ${S}/Makefile
+	einstall DESTDIR=${D} TCNG_INSTALL_CWD=/usr install-tcc || die "make install-tcc failed"
+	if use tcsim; then
+		einstall DESTDIR=${D} TCNG_INSTALL_CWD=/usr install-tcsim || die "make install-tcsim failed"
+	fi
+
+	# lots of doc stuff
+	dodoc CHANGES COPYING.GPL COPYING.LGPL README TODO VERSION tcc/PARAMETERS
+	dodoc doc/tcng.txt doc/README.tccext
+	newdoc doc/README README.doc
+	if use doc; then
+		dodoc doc/tcng.ps doc/tcng.pdf
+	fi
+	if use tcsim; then
+		newdoc tcsim/BUGS BUGS.tcsim
+		newdoc tcsim/README README.tcsim
+	fi
+}