fix bug #48609, and version bump.

7 files changed, 180 insertions, 11 deletions

diff --git a/sys-apps/tcng/ChangeLog b/sys-apps/tcng/ChangeLog
index 18e64df2d944..578588cd126c 100644
--- a/sys-apps/tcng/ChangeLog
+++ b/sys-apps/tcng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/tcng
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/ChangeLog,v 1.3 2003/12/17 11:58:17 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/ChangeLog,v 1.4 2004/04/24 10:37:30 robbat2 Exp $
+
+*tcng-9l (24 Apr 2004)
+
+  24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> tcng-9i.ebuild,
+  tcng-9l.ebuild, files/tcng-9l-fixes.patch:
+  fix bug #48609, and version bump.
 
 *tcng-9i (17 Dec 2003)
 
diff --git a/sys-apps/tcng/Manifest b/sys-apps/tcng/Manifest
index ad42f87a05dc..5e38ef317d7b 100644
--- a/sys-apps/tcng/Manifest
+++ b/sys-apps/tcng/Manifest
@@ -1,8 +1,11 @@
+MD5 885ff47ddff45a23ddf3821fed288971 tcng-9l.ebuild 4312
+MD5 2c665235840de81ca3821755c314ea3c tcng-9i.ebuild 4031
+MD5 0c23b2eb0477b525ebbb17d9b34ff8a2 tcng-9h.ebuild 2503
+MD5 7c06c95a6d2eb367e8b83c7d4e217344 ChangeLog 1003
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 055bee9ec58b1f245bee0772dda0b807 files/tcng-9i-gentoo.patch 410
+MD5 801eefdefb3e7784dceff74052cd7a88 files/tcng-9l-fixes.patch 413
 MD5 452318324f0c5e0571d8db1a63ee78d2 files/digest-tcng-9h 270
 MD5 bba07d9e3d5362bf04936fd2450b2d27 files/digest-tcng-9i 276
+MD5 ddfe867819ede95d01effbd33bedec14 files/digest-tcng-9l 276
 MD5 95bc941a647639a523cea5fc6b8ae92a files/tcng-9i-fixes.patch 2949
-MD5 055bee9ec58b1f245bee0772dda0b807 files/tcng-9i-gentoo.patch 410
-MD5 5d8e0941bb5cf2ea316e8fecc36a863c ChangeLog 829
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 92de650379f4c893fdf1b0821a70d34c tcng-9h.ebuild 2502
-MD5 48170cdc153937f857de7bafd34a6963 tcng-9i.ebuild 3993
diff --git a/sys-apps/tcng/files/digest-tcng-9l b/sys-apps/tcng/files/digest-tcng-9l
new file mode 100644
index 000000000000..b42d4422b4d9
--- /dev/null
+++ b/sys-apps/tcng/files/digest-tcng-9l
@@ -0,0 +1,4 @@
+MD5 b1dde4ec97fa042d76d498cf87019551 tcng-9l.tar.gz 517272
+MD5 b05a4e375d9468be3a1dd3f0e83daee8 iproute2-2.4.7-now-ss010824.tar.gz 140139
+MD5 ac343233aa5d745341da9e4ec22475af iproute_20010824-11.diff.gz 44736
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
diff --git a/sys-apps/tcng/files/tcng-9l-fixes.patch b/sys-apps/tcng/files/tcng-9l-fixes.patch
new file mode 100644
index 000000000000..0d34ac7c10ff
--- /dev/null
+++ b/sys-apps/tcng/files/tcng-9l-fixes.patch
@@ -0,0 +1,11 @@
+diff -ur tcng.orig/tcsim/setup.ulib tcng/tcsim/setup.ulib
+--- tcng.orig/tcsim/setup.ulib	2003-01-14 07:25:05.000000000 -0800
++++ tcng/tcsim/setup.ulib	2003-12-17 02:03:06.000000000 -0800
+@@ -213,4 +213,7 @@
+     perl -pi -e 's/exit\(0\);/return 0;/;' iproute2/tc/$n
+ done
+ 
+ touch .ready
++# Sometimes 'offsetof' is NOT defined, and we need to import it
++sed -i iproute2/tc/tc_qdisc.c -e '1i#include <stddef.h>'
++
diff --git a/sys-apps/tcng/tcng-9h.ebuild b/sys-apps/tcng/tcng-9h.ebuild
index ccc369de1ea7..212ec71a41ab 100644
--- a/sys-apps/tcng/tcng-9h.ebuild
+++ b/sys-apps/tcng/tcng-9h.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9h.ebuild,v 1.3 2003/12/17 11:58:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9h.ebuild,v 1.4 2004/04/24 10:37:30 robbat2 Exp $
 
 DESCRIPTION="tcng - Traffic Control Next Generation"
 HOMEPAGE="http://tcng.sourceforge.net/"
@@ -12,11 +12,11 @@ IUSE=""
 DEPEND="doc? ( virtual/ghostscript app-text/tetex media-gfx/transfig )
 	dev-lang/perl
 	virtual/os-headers
-	sys-apps/iproute"
+	sys-apps/iproute2"
 RDEPEND="sys-devel/gcc
 	tcsim? ( media-gfx/gnuplot )
 	dev-lang/perl
-	sys-apps/iproute"
+	sys-apps/iproute2"
 
 IPROUTE_PN="iproute"
 IPROUTE_PV="20010824"
diff --git a/sys-apps/tcng/tcng-9i.ebuild b/sys-apps/tcng/tcng-9i.ebuild
index 271d74128be9..7d21630a2b5e 100644
--- a/sys-apps/tcng/tcng-9i.ebuild
+++ b/sys-apps/tcng/tcng-9i.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/sys-apps/tcng/tcng-9i.ebuild,v 1.2 2004/04/21 16:28:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9i.ebuild,v 1.3 2004/04/24 10:37:30 robbat2 Exp $
 
 DESCRIPTION="Traffic Control Next Generation"
 HOMEPAGE="http://tcng.sourceforge.net/"
@@ -84,6 +84,8 @@ src_compile() {
 		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
diff --git a/sys-apps/tcng/tcng-9l.ebuild b/sys-apps/tcng/tcng-9l.ebuild
new file mode 100644
index 000000000000..b9cf52c114a3
--- /dev/null
+++ b/sys-apps/tcng/tcng-9l.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9l.ebuild,v 1.1 2004/04/24 10:37:30 robbat2 Exp $
+
+DESCRIPTION="tcng - Traffic Control Next Generation"
+HOMEPAGE="http://tcng.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="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
+DEPEND_COMMON="dev-lang/perl
+				sys-apps/iproute2
+				net-dialup/linux-atm
+				virtual/os-headers
+				sys-devel/gcc
+				sys-devel/binutils"
+
+DEPEND="doc? ( virtual/ghostscript app-text/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.25
+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}
+	http://ftp.debian.org/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}/${P}-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
+}