added minimal USE flag so we can yeild a build of tc. fixes compile failures in uclibc envionments where we might not have/want a dep of db for the arpd which can be provided elsewhere

4 files changed, 102 insertions, 16 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index b54fe3bf3a8a..5259c5fbcfd9 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.14 2004/08/09 04:05:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.15 2004/09/13 09:17:17 solar Exp $
+
+*iproute2-2.6.7.20040608-r1 (13 Sep 2004)
+
+  13 Sep 2004; <solar@gentoo.org> +iproute2-2.6.7.20040608-r1.ebuild:
+  added minimal USE flag so we can yeild a build of tc. fixes compile failures
+  in uclibc envionments where we might not have/want a dep of db for the arpd
+  which can be provided elsewhere
 
 *iproute2-2.4.7.20020116-r1 (09 Aug 2004)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index e440ec00e743..9da4467628c1 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 65e08dd17660a9d29b989c688f657f7b iproute2-2.6.7.20040608.ebuild 2167
+MD5 c9f2003aa1ac3d05b29b8c3dc610c1d9 iproute2-2.6.7.20040608-r1.ebuild 2354
 MD5 55847f12477ce4ec0567b6f229e9df64 ChangeLog 5947
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
 MD5 8380c9e0300d634fda9b63d84c66523b iproute2-2.4.7.20020116-r1.ebuild 2902
-MD5 65e08dd17660a9d29b989c688f657f7b iproute2-2.6.7.20040608.ebuild 2167
-MD5 ddd77e6d0215884a89ef5ad579945710 files/digest-iproute2-2.4.7.20020116-r1 169
-MD5 9977add19060fbeac6a3582ce8a5e098 files/2.4.7.20020116-htb.patch 9207
 MD5 d3a321fa8b70eef6df11d7343a14fd02 files/2.4.7.20020116-hfsc.patch 9507
+MD5 9977add19060fbeac6a3582ce8a5e098 files/2.4.7.20020116-htb.patch 9207
+MD5 deaba7e1316d6929cd4051724db3b885 files/digest-iproute2-2.6.7.20040608 161
 MD5 2d163d8622e69d17eb7ba73a61ffb51e files/2.4.7.20020116-local-exploit-fix.patch 666
+MD5 24a69d69fb222231a8d0f4358743190f files/2.6.7.20040608-misc-gentoo-fixes.patch 3970
+MD5 efc13e1a9a4a7bd080305d540ff5d48d files/digest-iproute2-2.6.7.20040608-r1 75
 MD5 249c1788ee3cc7a3d55dee871076a5a1 files/2.4.7.20020116-misc-deb-fixes.patch 977
-MD5 deaba7e1316d6929cd4051724db3b885 files/digest-iproute2-2.6.7.20040608 161
+MD5 ddd77e6d0215884a89ef5ad579945710 files/digest-iproute2-2.4.7.20020116-r1 169
 MD5 d0071e387038661c76eefb2c8e6b5c46 files/2.6.7.20040608-misc-deb-fixes.patch 632
-MD5 24a69d69fb222231a8d0f4358743190f files/2.6.7.20040608-misc-gentoo-fixes.patch 3970
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBFvg3HTu7gpaalycRAseSAKDQOsViVkjPt2bKOIzG94WHaQHkBACgpE8c
-VuM2q9xH5tebZVWyjcnZsi0=
-=+Ed2
------END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/digest-iproute2-2.6.7.20040608-r1 b/sys-apps/iproute2/files/digest-iproute2-2.6.7.20040608-r1
new file mode 100644
index 000000000000..f2c9c1a6d985
--- /dev/null
+++ b/sys-apps/iproute2/files/digest-iproute2-2.6.7.20040608-r1
@@ -0,0 +1 @@
+MD5 28196897deb1a45295cd606bd911a33d iproute2-2.6.7-ss040608.tar.gz 235008
diff --git a/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild
new file mode 100644
index 000000000000..4da532b454f6
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild,v 1.1 2004/09/13 09:17:17 solar Exp $
+
+inherit eutils gcc
+
+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 minimal"
+
+RDEPEND="virtual/libc
+	!minimal? ( 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}
+
+pkg_setup() {
+	SUBDIRS="lib ip tc misc"
+	use minimal && SUBDIRS="lib tc"
+}
+
+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."
+		echo
+	fi
+	# Disable q_delay if need be
+	if [ -z "`grep tc_dly_qopt ${ROOT}/usr/include/linux/pkt_sched.h`" ] ; then
+		ewarn "Your linux-headers in /usr/include/linux are too old to"
+		ewarn "support the DELAY scheduler.  It has been disabled."
+		echo
+		sed -i '/q_delay/s:.*::' tc/Makefile
+	fi
+
+	# Add a few debian fixes
+	epatch ${FILESDIR}/${PV}-misc-deb-fixes.patch
+	epatch ${FILESDIR}/${PV}-misc-gentoo-fixes.patch
+
+	# 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 CC="$(gcc-getCC)" KERNEL_INCLUDE=${ROOT}/usr/include SUBDIRS="${SUBDIRS}" || die
+}
+
+src_install() {
+	if use minimal; then
+		into /
+		dosbin tc/tc
+		return 0
+	fi
+	make install DESTDIR=${D} DOCDIR=/usr/share/doc/${PF} || die "make install failed"
+
+	into /
+	dosbin ip/{ifcfg,rtpr} || die "dosbin failed"
+
+	doman man/*/*
+}