Version bump.

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 124 insertions, 5 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index b210847d0ac3..0d17b0c02cec 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.58 2006/09/06 08:40:00 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.59 2006/10/14 01:33:14 vapier Exp $
+
+*iproute2-2.6.18.20061002 (14 Oct 2006)
+
+  14 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.6.18.20061002.ebuild:
+  Version bump.
 
   06 Sep 2006; Roy Marples <uberlord@gentoo.org>
   iproute2-2.6.16.20060323.ebuild:
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ede7c8f19a4d..fcb1626b5e21 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX iproute2-051007-esfq-2.6.13.patch 6499 RMD160 aee6f0cb90aae41664e8707a1b4874b5fb5ac2c6 SHA1 7f3689c01cbf885866266baedbc440e56b5679e9 SHA256 72a3aadd8e4825082e6e60d53ccb00a2b80930d49f7d51824e83435de5c0dfb0
 MD5 9b29094618e58434d24db4cd77edb622 files/iproute2-051007-esfq-2.6.13.patch 6499
 RMD160 aee6f0cb90aae41664e8707a1b4874b5fb5ac2c6 files/iproute2-051007-esfq-2.6.13.patch 6499
@@ -20,6 +23,7 @@ RMD160 a263bcc5646f8b8a7171f2c3a99f601f1a07d041 files/iproute2-2.6.16.20060323-r
 SHA256 f1891a8adeb66b9e3b27b24085aa5563d1707f984d9d3d632e60a85f19cce93c files/iproute2-2.6.16.20060323-routef-safe.patch 375
 DIST iproute2-2.6.15-060110.tar.gz 394322 RMD160 6738587d26a95cb2563fa5d218c00bd3ed3e598f SHA1 4683f4b60706023e92ccccd371b4d0008b8fd6d4 SHA256 9736c27e606b31af714e319bfad5bb9abdcbaf9b4f2ec496ca6310ff56b815d8
 DIST iproute2-2.6.16-060323.tar.gz 386555 RMD160 fbc5999842a6a1a5b4ba792e93e25ed8df7c959b SHA1 76d866bb3b46a7b2e73d79a4faf6fa8971527633 SHA256 e382a4c0de31a5196e0c7829d6f7e29d0263cf90a4def10302db694fc2f30da2
+DIST iproute2-2.6.18-061002.tar.gz 390298 RMD160 3e55f4e7d5022f84073157d943cd0002b304f5b7 SHA1 94f9b91d59e0e63b441130e158422a62a7a31b98 SHA256 038aabd2894f46d3a4a7583ab2bff13b2da51682ccb921ceb7c87326ec1d344f
 EBUILD iproute2-2.6.15.20060110.ebuild 1970 RMD160 531dfb2d7c667cbc0f1531b52c9b91d6ece185a4 SHA1 3c0488b315e0ddaef78d8f7a5596954dea555e8a SHA256 d1e9c6ea5d501a96b859d4c06ce6d8a5a8790343f1880eeb880c89dc68bf86bb
 MD5 e98c7815174c6fc1aff14d1753ec2de6 iproute2-2.6.15.20060110.ebuild 1970
 RMD160 531dfb2d7c667cbc0f1531b52c9b91d6ece185a4 iproute2-2.6.15.20060110.ebuild 1970
@@ -28,10 +32,14 @@ EBUILD iproute2-2.6.16.20060323.ebuild 2507 RMD160 9c6bec463a66942577a48e84d1a3c
 MD5 bbf82aeed63ebb0de214425e8dafb4d7 iproute2-2.6.16.20060323.ebuild 2507
 RMD160 9c6bec463a66942577a48e84d1a3c64519ffbce5 iproute2-2.6.16.20060323.ebuild 2507
 SHA256 f2fdddc3cb2b86a0c63504eeed6822145c352c6d835a09efe7b1e24a2f600230 iproute2-2.6.16.20060323.ebuild 2507
-MISC ChangeLog 13371 RMD160 29e3e8f24151f105423e7f5e4b0a257c483597ea SHA1 4bf0c57a5d6eb9cacc1995a136a1b17bec8154e5 SHA256 c42e7a68904d0d93b794dac7058735d2905710c66fd1139e6720e671105cce05
-MD5 bbb5553cea4413fa33c7b6af7247681b ChangeLog 13371
-RMD160 29e3e8f24151f105423e7f5e4b0a257c483597ea ChangeLog 13371
-SHA256 c42e7a68904d0d93b794dac7058735d2905710c66fd1139e6720e671105cce05 ChangeLog 13371
+EBUILD iproute2-2.6.18.20061002.ebuild 2469 RMD160 b8cfa2768e2d38a33c8c570f423fc4f269cafa41 SHA1 867e7ca0b68289d4951549ab6c9746d2d3374b01 SHA256 70cda9ca2e79f315f4d02250a9df4b1991d69c42f75ad1fc7baf057de8764502
+MD5 c70acccf903aeffd4ec665650f448eb4 iproute2-2.6.18.20061002.ebuild 2469
+RMD160 b8cfa2768e2d38a33c8c570f423fc4f269cafa41 iproute2-2.6.18.20061002.ebuild 2469
+SHA256 70cda9ca2e79f315f4d02250a9df4b1991d69c42f75ad1fc7baf057de8764502 iproute2-2.6.18.20061002.ebuild 2469
+MISC ChangeLog 13513 RMD160 e7d1f485ef410c42514b38401bd53349d03ca19f SHA1 d180b022490822c32d490b7c7979f317c7440b97 SHA256 2a409da9074b78acefc53c6cc28d9b720f40d8a9c8924bffb6b7e441d7c9187e
+MD5 060795f8204a00d19b85d26b03cc2507 ChangeLog 13513
+RMD160 e7d1f485ef410c42514b38401bd53349d03ca19f ChangeLog 13513
+SHA256 2a409da9074b78acefc53c6cc28d9b720f40d8a9c8924bffb6b7e441d7c9187e ChangeLog 13513
 MISC metadata.xml 225 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 SHA1 e384e99e2d9d8b4dd3ce54f8e857268cbe352c5e SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 metadata.xml 225
@@ -42,3 +50,13 @@ SHA256 fb8ccc446bf4164b55e461c3fc26b87a38942088ae25912fe62938abab59036b files/di
 MD5 c2bcd85e6af58ebf32f995225f8b766b files/digest-iproute2-2.6.16.20060323 268
 RMD160 14ad98d361d67d3027e98aeb1be8a7ec43e915d2 files/digest-iproute2-2.6.16.20060323 268
 SHA256 eeabcc17b891c84023aa1614021d5fe2d5e45d59cc3a0f04802c2a854ce20eaf files/digest-iproute2-2.6.16.20060323 268
+MD5 184ee764ff9e5355e38a9156b90a3fe3 files/digest-iproute2-2.6.18.20061002 268
+RMD160 da95832699083e43c9a110b0615d6969f51fe95b files/digest-iproute2-2.6.18.20061002 268
+SHA256 f83c3c99c672ee1a973cca660777579a229a5c7d3f3959c65f3fb2ddbb79ab64 files/digest-iproute2-2.6.18.20061002 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFMD50amhnQswr0vIRAhuCAJsETVTUvgZGjFBU4/ehmfVbYztjggCeLdXp
+ZWxUEMbSJavapRlarxRkzNA=
+=V2QW
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/digest-iproute2-2.6.18.20061002 b/sys-apps/iproute2/files/digest-iproute2-2.6.18.20061002
new file mode 100644
index 000000000000..edcf99081fec
--- /dev/null
+++ b/sys-apps/iproute2/files/digest-iproute2-2.6.18.20061002
@@ -0,0 +1,3 @@
+MD5 193b570128cf852afba337438413adf9 iproute2-2.6.18-061002.tar.gz 390298
+RMD160 3e55f4e7d5022f84073157d943cd0002b304f5b7 iproute2-2.6.18-061002.tar.gz 390298
+SHA256 038aabd2894f46d3a4a7583ab2bff13b2da51682ccb921ceb7c87326ec1d344f iproute2-2.6.18-061002.tar.gz 390298
diff --git a/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild b/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild
new file mode 100644
index 000000000000..b27c1b2100cc
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild,v 1.1 2006/10/14 01:33:14 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV%.*}
+SNAP=${PV##*.}
+SNAP=${SNAP:2}
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
+SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="atm berkdb minimal"
+
+RDEPEND="!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	>=virtual/os-headers-2.4.21"
+
+S=${WORKDIR}/${PN}-${MY_PV}-${SNAP}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		ewarn
+		ewarn "${PN} requires kernel support for Netlink (CONFIG_NETLINK)."
+		ewarn "This is only applies for kernels prior to 2.4.17"
+		ewarn
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
+
+	epatch "${FILESDIR}"/${PN}-2.6.16.20060323-build.patch #137574
+	epatch "${FILESDIR}"/${PN}-2.6.16.20060323-routef-safe.patch #139853
+
+	#68948 - esfq/wrr patches
+	epatch "${FILESDIR}"/${PN}-051007-esfq-2.6.13.patch
+	epatch "${FILESDIR}"/${PN}-2.6.11.20050330-wrr.patch
+
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
+	# Multilib fixes
+	sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h
+	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
+		netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} include/iptables.h || die
+	# Use correct iptables dir, #144265.
+	sed -i "s:/usr/local/lib/iptables:/$(get_libdir)/iptables:g" \
+		include/iptables.h
+}
+
+src_compile() {
+	echo -n 'TC_CONFIG_ATM:=' > Config
+	use atm \
+		&& echo 'y' >> Config \
+		|| echo 'n' >> Config
+
+	local SUBDIRS="lib ip tc misc netem"
+	use minimal && SUBDIRS="lib tc"
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SUBDIRS="${SUBDIRS}" \
+		|| die "make"
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc || die "minimal"
+		return 0
+	fi
+
+	make \
+		DESTDIR="${D}" \
+		SBINDIR=/sbin \
+		DOCDIR=/usr/share/doc/${PF} \
+		install \
+		|| die "make install failed"
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/sbin
+		mv "${D}"/sbin/arpd "${D}"/usr/sbin/
+	fi
+}