ver bump #54648 + stabilize older ver for x86/ppc/sparc

5 files changed, 90 insertions, 7 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 9ae61aaa36d5..f7c976df217e 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.8 2004/04/27 09:18:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.9 2004/06/22 03:00:50 vapier Exp $
+
+*iproute2-2.6.7.20040608 (21 Jun 2004)
+
+  21 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+  iproute2-2.4.7.20020116.ebuild, +iproute2-2.6.7.20040608.ebuild:
+  Version bump for new upstream #54648 by Ed Wildgoose.
 
 *iproute2-2.4.7.20020116 (20 Apr 2004)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 193b3f70a261..e9d890f8f899 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee20cf0b24313d215a4c8d02068412f0 ChangeLog 5239
+MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
+MD5 85e01aba6ef80152b17fa48f232e6e8d iproute2-2.4.7.20020116.ebuild 2789
+MD5 de5c06a8683121911feedbaec39a610d iproute2-2.4.7.20010824-r5.ebuild 2727
+MD5 039fbc8702f8cb4b0c9ff1d15a1c515a iproute2-2.6.7.20040608.ebuild 1738
 MD5 6430380d9057802a2f24581b2e7e1b3d files/digest-iproute2-2.4.7.20010824-r5 150
 MD5 299a059309d3dbe6202e0380c34bd7e1 files/digest-iproute2-2.4.7.20020116 83
 MD5 9977add19060fbeac6a3582ce8a5e098 files/2.4.7.20020116-htb.patch 9207
@@ -7,7 +15,11 @@ MD5 d3a321fa8b70eef6df11d7343a14fd02 files/2.4.7.20020116-hfsc.patch 9507
 MD5 2d163d8622e69d17eb7ba73a61ffb51e files/2.4.7.20020116-local-exploit-fix.patch 666
 MD5 0d2d21898d30525b3b77936c68a53dd4 files/2.4.7.20020116-manpages.patch 107468
 MD5 249c1788ee3cc7a3d55dee871076a5a1 files/2.4.7.20020116-misc-deb-fixes.patch 977
-MD5 e9bcfff4bfbe70910ca35d59c12f7e4f ChangeLog 5024
-MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
-MD5 6547ba67872e9dc7328d5c89cbb1d980 iproute2-2.4.7.20020116.ebuild 2793
-MD5 de5c06a8683121911feedbaec39a610d iproute2-2.4.7.20010824-r5.ebuild 2727
+MD5 efc13e1a9a4a7bd080305d540ff5d48d files/digest-iproute2-2.6.7.20040608 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA16DoHTu7gpaalycRAnA+AJ9Ua4RJmKC8zRjq/QgHn3rcSS1jYgCgrpLf
+v2TMqUUDs5DVPeJb0ks+kdk=
+=akyG
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/digest-iproute2-2.6.7.20040608 b/sys-apps/iproute2/files/digest-iproute2-2.6.7.20040608
new file mode 100644
index 000000000000..f2c9c1a6d985
--- /dev/null
+++ b/sys-apps/iproute2/files/digest-iproute2-2.6.7.20040608
@@ -0,0 +1 @@
+MD5 28196897deb1a45295cd606bd911a33d iproute2-2.6.7-ss040608.tar.gz 235008
diff --git a/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild b/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild
index 2144ee8e910d..2e3634bcc423 100644
--- a/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild
+++ b/sys-apps/iproute2/iproute2-2.4.7.20020116.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/iproute2/iproute2-2.4.7.20020116.ebuild,v 1.3 2004/05/26 12:40:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild,v 1.4 2004/06/22 03:00:50 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.iasi.roedu.net/mirrors/ftp.inr.ac.ru/ip-routing/${SRCFILE}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm hppa ~amd64 ia64"
+KEYWORDS="x86 ppc sparc ~mips ~alpha arm hppa ~amd64 ia64"
 IUSE="atm doc"
 
 RDEPEND="virtual/glibc
diff --git a/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild b/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild
new file mode 100644
index 000000000000..03e622acdae6
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild,v 1.1 2004/06/22 03:00:50 vapier Exp $
+
+inherit eutils
+
+MY_PV="${PV:0:5}"
+SNAP="${PV:${#PV}-6}"
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://developer.osdl.org/dev/iproute2/"
+SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-ss${SNAP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
+IUSE="atm"
+
+RDEPEND="virtual/glibc
+	sys-libs/db
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	>=virtual/os-headers-2.4.21
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Enable HFSC scheduler #45274
+	if [ ! -z "`grep tc_service_curve ${ROOT}/usr/include/linux/pkt_sched.h`" ] ; then
+		epatch ${FILESDIR}/2.4.7.20020116-hfsc.patch
+	else
+		ewarn "Your linux-headers in /usr/include/linux are too old to"
+		ewarn "support the HFSC scheduler.  It has been disabled."
+	fi
+
+	# Fix cflags and db code
+	sed -i \
+		-e 's:-I/usr/include/db3::g' \
+		-e "s:-O2:${CFLAGS}:g" \
+		Makefile || die "sed Makefile failed"
+	sed -i 's:-ldb-4\.1:-ldb:' misc/Makefile || die "sed misc/Makefile failed"
+	sed -i 's:db41/db_185:db_185:' misc/arpd.c || die "sed misc/arpd.c failed"
+
+	# Enable diffserv/atm support
+	if use atm ; then
+		sed -i 's:=n$:=y:' Config || die "sed Config failed"
+	fi
+}
+
+src_compile() {
+	emake KERNEL_INCLUDE=/usr/include || die
+}
+
+src_install() {
+	make install DESTDIR=${D} DOCDIR=/usr/share/doc/${PF} || die "make install failed"
+
+	into /
+	dosbin ip/{ifcfg,rtpr} || die "dosbin failed"
+
+	doman man/*/*
+}