3 files changed, 119 insertions, 6 deletions
diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 3dd3859d7f98..aa05a57db77f 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.147 2009/12/29 06:06:42 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.148 2010/03/07 00:18:59 vapier Exp $
+
+*iproute2-2.6.33 (07 Mar 2010)
+
+  07 Mar 2010; Mike Frysinger <vapier@gentoo.org> +iproute2-2.6.33.ebuild:
+  Version bump #307115 by Krzysztof Olędzki.
 
   29 Dec 2009; Mike Frysinger <vapier@gentoo.org> iproute2-2.6.31.ebuild,
   iproute2-9999.ebuild:
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 306ef76b6eca..c8d6acdfe744 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,16 +7,18 @@ AUX iproute2-2.6.29.1-flush.patch 5669 RMD160 63441945760ddaa5de5678934fc5e2d2a7
 AUX iproute2-2.6.29.1-hfsc.patch 37615 RMD160 580fbe97f4561ca9190768147100006602bef82e SHA1 276401d6ca4965a1008a1e7098de3acd2d4684d6 SHA256 4d41873a00841749a47142dc5591572b2d7df3b4d4c56d8dcebeb3c4cab30672
 DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71a4a8b SHA1 b6a43799bf5e8131307cf88b855031317af90eb4 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b
 DIST iproute2-2.6.31.tar.bz2 372539 RMD160 9372c1683553c5a0efbdf7a2756cc6a28e3a900f SHA1 e7dec62a4d6646f3fded4f5d34718e9fd98615e4 SHA256 56875eaed9c581645422d89e00fa7da512256c82ac3dae3c5051ff6827e83152
+DIST iproute2-2.6.33.tar.bz2 375000 RMD160 263bd12e4af88dbaa6c4b4fc75f186cca0a9266d SHA1 09d12790458b1d9e4fbd72d962304ac81530c4da SHA256 ef50a1f04a7f551a6a7802f4eef60fb06eed77bc8a8cbde7ffef950ded0abe02
 EBUILD iproute2-2.6.29.1-r1.ebuild 2696 RMD160 70887d2d603e1241dbb88c46a9611f91ae8da117 SHA1 a17de7e23be9fbc956aa6521c9b8385261b98447 SHA256 702da0ee8ab3597e51029f08d948de9ec31295e7e72cec2f6cd3eb870d145d03
 EBUILD iproute2-2.6.29.1-r3.ebuild 2724 RMD160 dab30bef80ed398773f03c408e229882139f0071 SHA1 8a662d0684effda45f5aee2ec51433c3b19309ed SHA256 84af160e662cd39bf822fc0b3d40df3145160b87cedfbfc1b1f7bd3a19d6f8d3
 EBUILD iproute2-2.6.31.ebuild 2605 RMD160 f193406642c42139ce3eecc957c7a85f7268705d SHA1 f204f2990dcc33e197217152c0ba1130da9a85b2 SHA256 18bf00ec4142df69057958e6cfb9ffbecc497e92fd1f99b52f7bf838c435185f
+EBUILD iproute2-2.6.33.ebuild 2605 RMD160 5e542a3837ca7bf1dbbe1a8f0dcd54e570aa3f88 SHA1 08fbca5a06eaaa386f74c5d86121985523b76a12 SHA256 f3c4ce385505757e6ec432026ef07e2f4a39cff8b0b1469aa92e54e0984a0806
 EBUILD iproute2-9999.ebuild 2604 RMD160 f8472e82eff1e97e84729db2291b19a7b83f7eca SHA1 3557ce1eb4aa2827eab4ec749e26c55520e3a8a4 SHA256 796fd2515705c235faca8c301a366f4821b880095a26c50da600dac7028af02d
-MISC ChangeLog 25504 RMD160 36521aec74c885b3bc0f414ce7dbd0dad127974b SHA1 1fc0b8878a7d88e84f32c66ccfaa732f73f04482 SHA256 86befa059155a3225da0835ca9d961f0ef05da90d155c7ba375021c8c6072be5
+MISC ChangeLog 25658 RMD160 295b68912ddb73690273d5d9943f25149e51a6f8 SHA1 06769f62ad07663828605526b35f641787f23512 SHA256 41fa7dd8835a6bedf014ccd35a8299246f02f5be434fe758e73b39c06706cded
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF0EAREIAAYFAks5nJwACgkQTwhj9JtAlp7hOgEAvO2QsIyXpf2Gma0EMVIWx4MV
-ToM80YH9/kCCbZi7CwMA+OQ1MVUw0hHtaZVAIsuXyX4a+pfcVggW4e57MKag2AA=
-=z/RR
+iF4EAREIAAYFAkuS8PkACgkQTwhj9JtAlp7wwAD/XypLEkYjHlhGvVGzhO9WsM0l
+ogKU/R7URCBWPV/C7dEA/1ezBTt4VcewgomevacRCraWv8lFoaGrcwR6NhyX9mTQ
+=63WF
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-2.6.33.ebuild b/sys-apps/iproute2/iproute2-2.6.33.ebuild
new file mode 100644
index 000000000000..a9b2a129cdad
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.33.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.33.ebuild,v 1.1 2010/03/07 00:18:59 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	if [[ ${PV} == *.*.*.* ]] ; then
+		MY_PV=${PV%.*}-${PV##*.}
+	else
+		MY_PV=${PV}
+	fi
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb minimal"
+
+RDEPEND="!net-misc/arpd
+	!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+	>=virtual/os-headers-2.6.27"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	sed -i "s:-O2:${CFLAGS} ${CPPFLAGS}:" Makefile || die "sed Makefile failed"
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+
+	epatch "${FILESDIR}"/${PN}-2.6.29.1-hfsc.patch #291907
+
+	epatch_user
+
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
+	# Multilib fixes
+	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
+		netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} || die
+	sed -i "s:/lib/tc:$(get_libdir)/tc:g" tc/Makefile || die
+}
+
+src_configure() {
+	echo -n 'TC_CONFIG_ATM:=' > Config
+	use atm \
+		&& echo 'y' >> Config \
+		|| echo 'n' >> Config
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+
+	# Use correct iptables dir, #144265 #293709
+	append-cppflags -DIPT_LIB_DIR=\\\"`$(tc-getPKG_CONFIG) xtables --variable=xtlibdir`\\\"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		|| die "make failed"
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc || die "minimal"
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		SBINDIR=/sbin \
+		DOCDIR=/usr/share/doc/${PF} \
+		MANDIR=/usr/share/man \
+		install \
+		|| die "make install failed"
+	prepalldocs
+	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
+}