11 files changed, 77 insertions, 707 deletions
diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 873aa0490e78..da7df6fe9123 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.171 2011/04/14 09:46:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.172 2011/06/11 13:18:51 scarabeus Exp $
+
+*iproute2-2.6.38 (11 Jun 2011)
+
+  11 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/iproute2-2.6.26-linux-2.6.27-API.patch, -iproute2-2.6.31.ebuild,
+  -iproute2-2.6.33.ebuild, -iproute2-2.6.34.ebuild,
+  -files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch,
+  -files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch,
+  -files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch,
+  -iproute2-2.6.35-r1.ebuild, -iproute2-2.6.37.ebuild, +iproute2-2.6.38.ebuild,
+  iproute2-9999.ebuild:
+  Cleanup live version to use git-2 and base eclasses, EAPI=4, remove wrong
+  prepalldocs call. Version bump to 2.6.38 (copy from live) which works with
+  latest iptables. Punt all overshadowed versions keeping 2 in testing and 2 in
+  stable. This also fixes bug #370793.
 
   14 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   iproute2-2.6.29.1-r1.ebuild, iproute2-2.6.31.ebuild, iproute2-2.6.33.ebuild,
diff --git a/sys-apps/iproute2/files/iproute2-2.6.26-linux-2.6.27-API.patch b/sys-apps/iproute2/files/iproute2-2.6.26-linux-2.6.27-API.patch
deleted file mode 100644
index 78647efa2cac..000000000000
--- a/sys-apps/iproute2/files/iproute2-2.6.26-linux-2.6.27-API.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5a67f8f9d3a7f80a49554fb1ca4e68a1effd5399 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen.hemminger@vyatta.com>
-Date: Mon, 15 Sep 2008 12:05:11 -0700
-Subject: [PATCH] Update to 2.6.27 API
-
-The one issue was the old multiqueue API, so that is handled
-by tc_util.h
----
- include/linux/atm.h                      |    1 +
- include/linux/if.h                       |   15 ++++++++-------
- include/linux/if_vlan.h                  |    1 +
- include/linux/ip6_tunnel.h               |    4 ----
- include/linux/netfilter.h                |    1 +
- include/linux/netfilter_ipv4.h           |    1 +
- include/linux/netfilter_ipv4/ip_tables.h |    1 +
- include/linux/pkt_cls.h                  |    1 +
- include/linux/pkt_sched.h                |   29 ++++++++++++++++++++---------
- include/linux/rtnetlink.h                |    1 +
- include/linux/socket.h                   |    5 ++++-
- tc/tc_util.h                             |   12 ++++++++++++
- 12 files changed, 51 insertions(+), 21 deletions(-)
-
-diff --git a/tc/tc_util.h b/tc/tc_util.h
-index 796da54..39d5367 100644
---- a/tc/tc_util.h
-+++ b/tc/tc_util.h
-@@ -7,6 +7,18 @@
- #include <linux/gen_stats.h>
- #include "tc_core.h"
- 
-+/* This is the deprecated multiqueue interface */
-+#ifndef TCA_PRIO_MAX
-+enum
-+{
-+	TCA_PRIO_UNSPEC,
-+	TCA_PRIO_MQ,
-+	__TCA_PRIO_MAX
-+};
-+
-+#define TCA_PRIO_MAX    (__TCA_PRIO_MAX - 1)
-+#endif
-+
- struct qdisc_util
- {
- 	struct  qdisc_util *next;
--- 
-1.6.0.2
-
diff --git a/sys-apps/iproute2/files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch b/sys-apps/iproute2/files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch
deleted file mode 100644
index 7dbe9fa970d4..000000000000
--- a/sys-apps/iproute2/files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f9ec992065291ddada270aebad0d5c82d8ed72db Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 9 Jun 2010 20:46:33 -0400
-Subject: [PATCH] dnet: fix strict aliasing warnings
-
-Recent gcc doesn't like it when you cast char pointers to uint16_t
-pointers and then dereference it.  So use memcpy() instead and let
-gcc take care of optimizing things away (when appropriate).  This
-should also fix alignment issues on arches where gcc packs the char
-pointer tighter than 16bits.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/dnet_ntop.c |    8 ++++++--
- lib/dnet_pton.c |    5 ++++-
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/lib/dnet_ntop.c b/lib/dnet_ntop.c
-index 9500df8..507a7eb 100644
---- a/lib/dnet_ntop.c
-+++ b/lib/dnet_ntop.c
-@@ -1,4 +1,5 @@
- #include <errno.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <netinet/in.h>
- 
-@@ -35,11 +36,14 @@ static __inline__ int do_digit(char *str, u_int16_t *addr, u_int16_t scale, size
- 
- static const char *dnet_ntop1(const struct dn_naddr *dna, char *str, size_t len)
- {
--	u_int16_t addr = dn_ntohs(*(u_int16_t *)dna->a_addr);
--	u_int16_t area = addr >> 10;
-+	u_int16_t addr, area;
- 	size_t pos = 0;
- 	int started = 0;
- 
-+	memcpy(&addr, dna->a_addr, sizeof(addr));
-+	addr = dn_ntohs(addr);
-+	area = addr >> 10;
-+
- 	if (dna->a_len != 2)
- 		return NULL;
- 
-diff --git a/lib/dnet_pton.c b/lib/dnet_pton.c
-index bd7727a..7385756 100644
---- a/lib/dnet_pton.c
-+++ b/lib/dnet_pton.c
-@@ -1,4 +1,5 @@
- #include <errno.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <netinet/in.h>
- 
-@@ -37,6 +38,7 @@ static int dnet_num(const char *src, u_int16_t * dst)
- 
- static int dnet_pton1(const char *src, struct dn_naddr *dna)
- {
-+	u_int16_t addr;
- 	u_int16_t area = 0;
- 	u_int16_t node = 0;
- 	int pos;
-@@ -48,7 +50,8 @@ static int dnet_pton1(const char *src, struct dn_naddr *dna)
- 	if ((pos == 0) || (node > 1023))
- 		return 0;
- 	dna->a_len = 2;
--	*(u_int16_t *)dna->a_addr = dn_htons((area << 10) | node);
-+	addr = dn_htons((area << 10) | node);
-+	memcpy(dna->a_addr, &addr, sizeof(addr));
- 
- 	return 1;
- }
--- 
-1.7.1
-
diff --git a/sys-apps/iproute2/files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch b/sys-apps/iproute2/files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch
deleted file mode 100644
index fc74638fc24c..000000000000
--- a/sys-apps/iproute2/files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a84389f8d3f0960c60db81f83057140a17f5c841 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 9 Jun 2010 20:36:57 -0400
-Subject: [PATCH] netem: fix installs of dist files
-
-The tc program searches LIBDIR by default for the .dist files, and that
-defaults to /usr/lib.  But the netem subdir has /lib/ hardcoded which
-means the default build+install results in the files not being found.
-
-Further, these are plain text files which are read at runtime, so it
-doesn't make sense to give them executable bits.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- netem/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/netem/Makefile b/netem/Makefile
-index b6ccfc6..e52e125 100644
---- a/netem/Makefile
-+++ b/netem/Makefile
-@@ -20,9 +20,9 @@ stats: stats.c
- 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
- 
- install: all
--	mkdir -p $(DESTDIR)/lib/tc
-+	mkdir -p $(DESTDIR)$(LIBDIR)/tc
- 	for i in $(DISTDATA); \
--	do install -m 755 $$i $(DESTDIR)/lib/tc; \
-+	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
- 	done
- 
- clean:
--- 
-1.7.1
-
diff --git a/sys-apps/iproute2/files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch b/sys-apps/iproute2/files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch
deleted file mode 100644
index f9c90898fa9e..000000000000
--- a/sys-apps/iproute2/files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 94efd93e2bdd2a1d739f4f86bf6a013b081a481a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 9 Jun 2010 20:32:26 -0400
-Subject: [PATCH] tc: revert "echo" in install target
-
-The recent commit "iproute2: add option to build m_xt as a tc module"
-(ab814d635529787) looks like it wrongly included debug changes in the
-install target.  So drop the `echo` so the tc binary actually gets
-installed again.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tc/Makefile |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tc/Makefile b/tc/Makefile
-index 01a16fc..3aa9f26 100644
---- a/tc/Makefile
-+++ b/tc/Makefile
-@@ -99,10 +99,10 @@ libtc.a: $(TCLIB)
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	echo mkdir -p $(MODDESTDIR)
--	echo install -m 0755 tc $(DESTDIR)$(SBINDIR)
-+	mkdir -p $(MODDESTDIR)
-+	install -m 0755 tc $(DESTDIR)$(SBINDIR)
- 	for i in $(TCSO); \
--	do echo install -m 755 $$i $(MODDESTDIR); \
-+	do install -m 755 $$i $(MODDESTDIR); \
- 	done
- 	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
- 	if [ -f $(MODDESTDIR)/m_xt.so ]; \
--- 
-1.7.1
-
diff --git a/sys-apps/iproute2/iproute2-2.6.31.ebuild b/sys-apps/iproute2/iproute2-2.6.31.ebuild
deleted file mode 100644
index 5371b7140491..000000000000
--- a/sys-apps/iproute2/iproute2-2.6.31.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.31.ebuild,v 1.9 2011/04/14 09:46:42 flameeyes 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 )
-	>=sys-kernel/linux-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
-}
diff --git a/sys-apps/iproute2/iproute2-2.6.33.ebuild b/sys-apps/iproute2/iproute2-2.6.33.ebuild
deleted file mode 100644
index 16b3e6284810..000000000000
--- a/sys-apps/iproute2/iproute2-2.6.33.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 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.2 2011/04/14 09:46:42 flameeyes 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 )
-	>=sys-kernel/linux-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
-}
diff --git a/sys-apps/iproute2/iproute2-2.6.34.ebuild b/sys-apps/iproute2/iproute2-2.6.34.ebuild
deleted file mode 100644
index 1a4bf84f69b9..000000000000
--- a/sys-apps/iproute2/iproute2-2.6.34.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.34.ebuild,v 1.2 2011/04/14 09:46:42 flameeyes 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 )
-	>=sys-kernel/linux-headers-2.6.27"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tc-revert-echo-in-install-target.patch
-	epatch "${FILESDIR}"/${P}-netem-fix-installs-of-dist-files.patch #320333
-	epatch "${FILESDIR}"/${P}-dnet-fix-strict-aliasing-warnings.patch
-
-	sed -i \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		Makefile || die
-
-	# 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
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
-}
-
-src_configure() {
-	echo -n 'TC_CONFIG_ATM:=' > Config
-	use atm \
-		&& echo 'y' >> Config \
-		|| echo 'n' >> Config
-
-	# 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
-}
-
-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
-	prepalldocs
-
-	dolib.a lib/libnetlink.a || die
-	insinto /usr/include
-	doins include/libnetlink.h || die
-
-	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
-}
diff --git a/sys-apps/iproute2/iproute2-2.6.37.ebuild b/sys-apps/iproute2/iproute2-2.6.37.ebuild
deleted file mode 100644
index eb21ef79406e..000000000000
--- a/sys-apps/iproute2/iproute2-2.6.37.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.37.ebuild,v 1.2 2011/04/14 09:46:42 flameeyes 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 +iptables ipv6 minimal"
-
-RDEPEND="!net-misc/arpd
-	iptables? ( >=net-firewall/iptables-1.4.5 )
-	!minimal? ( berkdb? ( sys-libs/db ) )
-	atm? ( net-dialup/linux-atm )"
-DEPEND="${RDEPEND}
-	iptables? ( dev-util/pkgconfig )
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.27"
-
-src_prepare() {
-	sed -i \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		Makefile || die
-
-	# 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
-	use ipv6 || epatch "${FILESDIR}"/${PN}-2.6.35-no-ipv6.patch #326849
-	epatch "${FILESDIR}"/${PN}-2.6.35-no-iptables.patch
-
-	epatch_user
-
-	# don't build arpd if USE=-berkdb #81660
-	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
-}
-
-use_yn() { use $1 && echo y || echo n ; }
-src_configure() {
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(use_yn atm)
-	TC_CONFIG_XT  := $(use_yn iptables)
-	EOF
-	if use iptables ; then
-		# Use correct iptables dir, #144265 #293709
-		append-cppflags -DXT_LIB_DIR=\\\"`$(tc-getPKG_CONFIG) xtables --variable=xtlibdir`\\\"
-	fi
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		AR="$(tc-getAR)" \
-		|| die
-}
-
-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
-	prepalldocs
-
-	dolib.a lib/libnetlink.a || die
-	insinto /usr/include
-	doins include/libnetlink.h || die
-
-	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
-}
diff --git a/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.38.ebuild
index ed1ca2097606..737af312c19b 100644
--- a/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.38.ebuild
@@ -1,44 +1,48 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild,v 1.5 2011/04/14 09:46:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.38.ebuild,v 1.1 2011/06/11 13:18:51 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit eutils toolchain-funcs flag-o-matic
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git
-	SRC_URI=""
-	#KEYWORDS=""
+if [[ ${PV} == *.*.*.* ]] ; then
+	MY_PV=${PV%.*}-${PV##*.}
 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}
+	MY_PV=${PV}
 fi
+MY_P="${PN}-${MY_PV}"
+
+inherit eutils toolchain-funcs flag-o-matic base ${SCM_ECLASS}
+unset SCM_ECLASS
 
 DESCRIPTION="kernel routing and traffic control utilities"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+[[ ${PV} == "9999" ]] || SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb ipv6 minimal"
+[[ ${PV} == "9999" ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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 )
 	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.27"
+	>=sys-kernel/linux-headers-2.6.27
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.29.1-hfsc.patch" #291907
+)
 
 src_prepare() {
+	base_src_prepare
+
 	sed -i \
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
@@ -47,11 +51,6 @@ src_prepare() {
 	# 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
-	use ipv6 || epatch "${FILESDIR}"/${PN}-2.6.35-no-ipv6.patch #326849
-
-	epatch_user
-
 	# don't build arpd if USE=-berkdb #81660
 	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
 
@@ -59,10 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	echo -n 'TC_CONFIG_ATM:=' > Config
-	use atm \
-		&& echo 'y' >> Config \
-		|| echo 'n' >> Config
+	echo "TC_CONFIG_ATM:=$(use atm && echo "y" || echo "n")" > Config
 
 	# Use correct iptables dir, #144265 #293709
 	append-cppflags -DIPT_LIB_DIR=\\\"`$(tc-getPKG_CONFIG) xtables --variable=xtlibdir`\\\"
@@ -71,15 +67,13 @@ src_configure() {
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		AR="$(tc-getAR)" \
-		|| die
+		AR="$(tc-getAR)"
 }
 
 src_install() {
 	if use minimal ; then
 		into /
-		dosbin tc/tc || die "minimal"
+		dosbin tc/tc
 		return 0
 	fi
 
@@ -88,18 +82,16 @@ src_install() {
 		SBINDIR=/sbin \
 		DOCDIR=/usr/share/doc/${PF} \
 		MANDIR=/usr/share/man \
-		install \
-		|| die
-	prepalldocs
+		install
 
-	dolib.a lib/libnetlink.a || die
+	dolib.a lib/libnetlink.a
 	insinto /usr/include
-	doins include/libnetlink.h || die
+	doins include/libnetlink.h
 
 	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/
+		mv "${ED}"/sbin/arpd "${ED}"/usr/sbin/
 	fi
 }
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 216d08d0615b..855c66792a26 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,44 +1,48 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.14 2011/04/14 09:46:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.15 2011/06/11 13:18:51 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit eutils toolchain-funcs flag-o-matic
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git
-	SRC_URI=""
-	#KEYWORDS=""
+if [[ ${PV} == *.*.*.* ]] ; then
+	MY_PV=${PV%.*}-${PV##*.}
 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}
+	MY_PV=${PV}
 fi
+MY_P="${PN}-${MY_PV}"
+
+inherit eutils toolchain-funcs flag-o-matic base ${SCM_ECLASS}
+unset SCM_ECLASS
 
 DESCRIPTION="kernel routing and traffic control utilities"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+[[ ${PV} == "9999" ]] || SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
+[[ ${PV} == "9999" ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 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 )
 	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.27"
+	>=sys-kernel/linux-headers-2.6.27
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.29.1-hfsc.patch" #291907
+)
 
 src_prepare() {
+	base_src_prepare
+
 	sed -i \
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
@@ -47,10 +51,6 @@ src_prepare() {
 	# 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
 
@@ -58,10 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	echo -n 'TC_CONFIG_ATM:=' > Config
-	use atm \
-		&& echo 'y' >> Config \
-		|| echo 'n' >> Config
+	echo "TC_CONFIG_ATM:=$(use atm && echo "y" || echo "n")" > Config
 
 	# Use correct iptables dir, #144265 #293709
 	append-cppflags -DIPT_LIB_DIR=\\\"`$(tc-getPKG_CONFIG) xtables --variable=xtlibdir`\\\"
@@ -70,14 +67,13 @@ src_configure() {
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		|| die
+		AR="$(tc-getAR)"
 }
 
 src_install() {
 	if use minimal ; then
 		into /
-		dosbin tc/tc || die "minimal"
+		dosbin tc/tc
 		return 0
 	fi
 
@@ -86,18 +82,16 @@ src_install() {
 		SBINDIR=/sbin \
 		DOCDIR=/usr/share/doc/${PF} \
 		MANDIR=/usr/share/man \
-		install \
-		|| die
-	prepalldocs
+		install
 
-	dolib.a lib/libnetlink.a || die
+	dolib.a lib/libnetlink.a
 	insinto /usr/include
-	doins include/libnetlink.h || die
+	doins include/libnetlink.h
 
 	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/
+		mv "${ED}"/sbin/arpd "${ED}"/usr/sbin/
 	fi
 }