From 745467fc20419f88223329f2782c34a81c30fef8 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 30 Jun 2015 07:45:45 +0000
Subject: Version bump. Removed old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
---
 sys-apps/iproute2/ChangeLog                |   8 +-
 sys-apps/iproute2/Manifest                 |  32 ++++----
 sys-apps/iproute2/iproute2-4.0.0-r1.ebuild | 125 ----------------------------
 sys-apps/iproute2/iproute2-4.0.0.ebuild    | 124 ----------------------------
 sys-apps/iproute2/iproute2-4.1.0.ebuild    | 128 +++++++++++++++++++++++++++++
 5 files changed, 151 insertions(+), 266 deletions(-)
 delete mode 100644 sys-apps/iproute2/iproute2-4.0.0-r1.ebuild
 delete mode 100644 sys-apps/iproute2/iproute2-4.0.0.ebuild
 create mode 100644 sys-apps/iproute2/iproute2-4.1.0.ebuild

(limited to 'sys-apps/iproute2')

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 5f277ce63b3e..afea5de3042e 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.263 2015/05/24 03:42:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.264 2015/06/30 07:45:44 polynomial-c Exp $
+
+*iproute2-4.1.0 (30 Jun 2015)
+
+  30 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> -iproute2-4.0.0.ebuild,
+  -iproute2-4.0.0-r1.ebuild, +iproute2-4.1.0.ebuild:
+  Version bump. Removed old.
 
   24 May 2015; Mike Frysinger <vapier@gentoo.org> iproute2-4.0.0-r2.ebuild,
   iproute2-9999.ebuild, metadata.xml:
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index e3e8a11f79ee..f071b259b977 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -23,31 +23,31 @@ DIST iproute2-3.19.0.tar.xz 455004 SHA256 e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c161
 DIST iproute2-3.3.0.tar.bz2 416353 SHA256 f328ec01bac64854f477b9440b0bbeae91895b4ba266821597ceac6bd1501c3b SHA512 825b473e3fb17cf724bc389bb99dabbdabf9c5bfee89890f723027f3412a82a9c7f77ac8b792a218ff50dd552e31105206ccff1897b68fe201d83e5764032feb WHIRLPOOL 7827cb8d447eb86d89dc14dedecb94d7e1a9fc9380ee2130d28047f834f5b96045226409448a8f159501f9bd20b1eebe7c32ae17d5687c4c071459ae9c807ebc
 DIST iproute2-3.8.0.tar.xz 407608 SHA256 579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f SHA512 0d93070044f573055a7cc58bd006e476f5b0fcb75cb5d49a37417aa7583e637a92e460947434cef9b9449267e4529c655a23b5ed3d549a2aba128148cb8d4ade WHIRLPOOL bfb29c34953f205f7c801a86a38f58d9352b716504649e61665ced6dd48557291412de5fd8987dbab44fbd397dab4a6b55d6c371c7cbaaea3d6e29269df115df
 DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
+DIST iproute2-4.1.0.tar.xz 495312 SHA256 d1326696c6a8f81ba66aaf48d858005cf280c81d3284d8d2c99748e3d0746146 SHA512 81faa393a2c7bf5286d7b54817646fb3763d66fbda8b6902e137061827fa1d54d58e9e4fb4f8415222f5adc1b0bec77b6ecf94d1b7cc11834283593208fb4209 WHIRLPOOL 938f0f68d74c8c1bef1be005b55b1b652bf74e23671d6fde493819058e1464c0f3931d69d7dbc398f0ed99ce42fa2bcd80c5207fabfdad78389e4e19b8051112
 EBUILD iproute2-2.6.38.ebuild 2263 SHA256 7210b6028e9532acd57e584ec1aea57b11734cdc121b97ced75dea0897f6503a SHA512 5eaa87ba4ba467cb826c7b3e652e21dc505afa9e36afef5fca75ba80fae70f207739cbd28146bb4817073719675156c5fa68799cdc6897d0f4d523a59ae3b77b WHIRLPOOL 58ec9641a824db8afbf0f60372577a5240ddd7d1375f8fdacd4c163191f6e0757f5914878c8dd26cc1069b29664275949d33842c2e5d51f0a424b795d7702587
 EBUILD iproute2-3.17.0.ebuild 3638 SHA256 6c16e44f1d90bd4d113a3bb7047e3a10e27c3cd206c1040568384ee537f84b62 SHA512 fea32c02eba7cb6acdccbac187fba5a8c39e090cc6f9a92f210f0261b7d8f5f417e02d7cf6d89af160ee909090d8c869557bc27b66e44b530ba652c696b4747a WHIRLPOOL 04214acab5a60311b0ccba25bf27d4458baecd9a83de9a86b67942e0df0949d582db11752ccc5fbe476da0ea2e1f5d73a090da5c7b6e19a1ddacfb90c2594f42
 EBUILD iproute2-3.19.0.ebuild 3638 SHA256 b7fa11efed4736a844228870b7ada7b50759a2c4068271de06ea9c6712696559 SHA512 3e8ec926cbb276ffc68b89403ba818329d02bc76b21118ac20440ca2d66eab49f2c21e4f00f579588570c439a33fde0f0ef9bb4257283f9833f8b1c81ae01efd WHIRLPOOL 694a4e6df549e73e27560fce35dfbb937195faa95096d22429e39e30c22dc45858c821750ee6cc9c4f47175d74802f62853e1e2ab1aad32174b952f091ad1f69
 EBUILD iproute2-3.3.0.ebuild 2972 SHA256 1e09b07a850aea92e7e57a0adef53246ff7cc8d8498ba7ccadf8eb0cd814bebc SHA512 2ddd5321a9f378322b72fe5fd9dc7c45b6e2ef26cacf42f5d731127b8e249495e2adbb36f1972174424f28a493b4a82b5610add9961855a8559d746cdbab9eb0 WHIRLPOOL 5c3716f6ab9a18e2fea0e8acaa0e2bd347edc189e2b485e61f5373327c7f675499f7e239961697b78e21393dcde2a5994c17c420c649b3503fdfaefbcbe1fa57
 EBUILD iproute2-3.8.0.ebuild 3493 SHA256 e9fb3f69673cf3e6cec6abf83ca59bbf84af19547fc5245e23f9b8af2f8d6dff SHA512 38180309ad908833407c6fa681aa4e7b0fa5e3723d8a4d9667d161adf8c90fe2a6565c82989a7681179b8943553ebd71c8858b59f1b545465189df1a4e7b4682 WHIRLPOOL a59f47eb73a56790f9314ed386fb18eae47152d1d7e4d986ee859ac59eec2798026148ec691259e0ba6011f31f0f965af9846853b670f245de3496bfcd934c20
-EBUILD iproute2-4.0.0-r1.ebuild 3719 SHA256 2b099227b5e0648519d27fae7cc036f1353607cd247b2a110b58207f37bb71f5 SHA512 b998e1cf87b650f2f5781e0e1785dd5d8f0ca1081e3cb8105ae66fa9869594066bbd693b20280284ed5a5101f26331c883ef2c6dd85ff8c5707cf0c14c760955 WHIRLPOOL dd75cffae714679d09fa725211223416ef83147bb33447d71e6c5c597f14fc537df8f6f0096e5ce545cf107d78f41b3911a41b41472e3a5ff0dc4286a97a0d1f
 EBUILD iproute2-4.0.0-r2.ebuild 3856 SHA256 3aeddd89ab93d3c7b4cd53402a8ad8eb343aaab7db5691aeb47914fcd52b67af SHA512 3b3646d2098f3b2a9b110187edf1a3330959d73e7d7f928ccc212f3931d5f5f59836563de0dc1d93bf28ee8c634995ed6f357931ed6107a714aafb6e57cade31 WHIRLPOOL dbeddb628fd80e0c6b9c270f05a28317fd74d8aa1e3b72eeb8ba99c2225c6399c35d55c7aa07efdee4b85dc1c7b0cd57519ca6b25068fb35cb00d62a6c736118
-EBUILD iproute2-4.0.0.ebuild 3657 SHA256 c9d9f723a03194a8957f9a1450145ce818521f3cc2d6e5d2aa56dd1891777e58 SHA512 ae24da9eca350f10b8ca65901fa5b9febf17a4b2d140c95e97287adc0bad00e23c1a27e6208fbeb21183fce8c550c9770ae14f79c96e54e37918ec782924eaa1 WHIRLPOOL 25b91bc7ae6caaf0569bab1300a93a3203349ab051f80f439815ddb187458250921474a847f3493d9c8e6803e74f9951d3944ac01dd24317ad00f587c0638cbd
+EBUILD iproute2-4.1.0.ebuild 3794 SHA256 7295c0bdbf4f82989eee423eefd8d8261782a011aa5698c2d1fd229f081eede2 SHA512 2d39bce15dd4b67cc04a95efe0bdebf86c2fa4e9d263ec81d46139b043e476b1313560fc2836ea71383551af6e7eff57a10de15c94e2ba59ce15f2d3e05743a7 WHIRLPOOL a4c05ef5cab63ea97a10515033154e3b31fe8d9684a2c5e62a682b29f7b96df80b1ef867d683303536c16cdfde717ba6e187ed38ccf41d95feac7f9b872ac654
 EBUILD iproute2-9999.ebuild 3845 SHA256 9ab91cfc2124ed0e59e68110e4b266de888d560df2fb3c14fcdcbcc57d8fc5b0 SHA512 678eb817464b2cf66c929e1bb49e87a6b7a1ca6b090e2901908a5d85de548bc3587dc6263563a5c94f4bc417c62b3f2707b8631d5148572c238370907a96dd02 WHIRLPOOL b7b0c81f1e82039634747d058a947e60074cd5e0982b32e3c06cfc8ef7e77784557b4c2d8f28c5d50c24623fb6b8f267e2f1d3640df0aa89a3ab9be6b7c0393d
-MISC ChangeLog 43243 SHA256 172df6243fed5f6289c2141a803be423c3bf8bf34bc9f4fae5a7c302e1680c64 SHA512 52066f01d7d68c4a126122036028bd59bbcecd4015c7b0f466b3569a0b405369b55bd47dd1e2eed3d54664da3b6d158784f3ad01f5e0476cac37454f8db7bf30 WHIRLPOOL 0f8c3ac04d4c59546c0a559b796a84d87644209fcc3658a099471f912413476a2ec972c684582a6e2c17ac9de876c7e9e003a5ec421c373655d168440bc18f0e
+MISC ChangeLog 43441 SHA256 6596bf1d29c4a03c21873e7166004c573311a0b8e92bbf2f8dce57f8e2a24cc6 SHA512 2626df11d9a797e9520e54c005f86e4eb8633c7a8486e1ecfa686727273725caaa69f6cdb2e85113bbf9cee8aa58302cae1915220ba06e3e6b41a350f69df407 WHIRLPOOL c081f2db4cea8a219be7a1aa09b227105240f6ed300ce7aacebe8acc87893492de6632760dd186bf5fbf0b50805cc57a97e77edb1ac22155225a01da4f07f380
 MISC metadata.xml 378 SHA256 ce154f89a4a5279c86abb4c1794849f7f3126ed5597db0459d3a7e639ef27de0 SHA512 aa181ac7826b756d8ca929df93c8445552a867ded0a3e3e78b30387b8241191f8f99c3a598835f38ea1a20c068dcc95b0bf9ebfd9c04aa9359c332bfdb3a2770 WHIRLPOOL 2b2ea65050de53e25da24cdd48c59bfd802b9176e9571aac010d5b6a8b7b63833b1dda1e84dcbddfd7113f3614b0bd1e929984078a5f69a791a17cc807fc7da2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVYUiQAAoJEPGu1DbS6WIAhkUQAJQqsQIhuUWl6NLaQM45nA4K
-8Muu0CIZzV4RzBeBn9hljt+mitH9id6GCPmAq6ZqAF8hDDgT0Av6zN7SxtWOBKdr
-QXB+06wJ9eNKBtxR3ceyLwS1kIY2e4ONOy1tPcId2DKQd+PXwCCwAXGm3kru+Udi
-/ulaR6LNoIFA6RMTZAuEoTDAtHlWMeqDiAFEH96Ty95mkTkI3GOE+9w6+sYa0V28
-E9QQpguzHrPNijaRPIVXjjc/TKfeflN5aL3ZqAaqQwZkq+05WsV6a3WkhTUNqss9
-uUOhkHpmJd+gZ2UD3Q2aEJEYkFmGWgFJYC6+luQYKrZmQGPl4o0saFtExoCAajhk
-lnVok5jDrolxV2L8F+R5GS/TOEOiRSynq9FNzgsnioSmAGPProcPeLxS+dwBiYbe
-c6Ivku8SnQtkf4hNYbXV+HTdMlGbABG2OPiBOmgGvo62JD44Hcl5+YelAM7SPPH2
-FUru3kiG0ksZ9TDBUGz/cpajP0fA1r60XPH8FylJzG66Bmc8HONEeFfzHsArywXF
-Yf8L7gbcHzqe2F1Li+A9WJq0qXhbBxHxk1xcLqeUJIUyuBG5wvMfVz2uCcKhhSJt
-WTLgVZjKh4mIdWXbGfPlkF1rTePs94MBE9in3+nNPf9I6gfRlLXtEgdmFB/ZEztV
-5m9iBKvf/n5ElBlELBBW
-=Y+tH
+iQIcBAEBCAAGBQJVkkkpAAoJEPiazRVxLXTFlXIQAIR/VwK6VkB83Z8O0N9Zm3XQ
+amiHqLkdQLJkv9crO1RQmpSjhfoy8vDjx2pGA0J3x9cwNum4EzBmqKFk1zCB3ztm
+1rY711tydFG6fN9lXFDmaW9NGMQP0LYL/8OS3KmQfykyZnSroBWe6+QkzPPrqFXp
+BK/4M7f1h2bTqP9rGS8EfIjIvQc9NztKxtjNlNcLAziuy4UBVvXOuJJaSEaidZy4
+EWWjUEmBiw2ntJ2ambfDf+7yhPgqi4K+yZ5phxKdTvIUY33+MTG8xKX8V+VtKTGL
+5GvHd2z6CwzrI6LQD8DBsefbZfpKDrFmn5jaqRo8hM5r75QNFP4gHgu3OQ06H+Ow
+5laEFpzbUD2eCUhBnPVVo0fbRln8NNrmXyiv1HDCPLwZ6wDM/Mjpc/gOmRT4+yCL
+Vy1TMxoiK3d7fWgo9Kk7fZb0cx+zgFqqp3k477LDcVlzZMV3zAC6phvwph2o1Iqx
+U1nCmK6OFuE+j9SCV7YUhUhCy4v8ekoYBOTd4tpZJ3S8k6eV5Dp44gMCn6tcvXZr
+gDtACK/PC/sE3kmCWwL85wHegOACOUGEGHbmP2gaoKl9XuLhickJ6Y5H1k7ZzFN8
+w2w6QqBvDi6WHVlWPylju6UK52AWpMsDVGHHnv/4VHMw8VAfwHIlo8IKcocwZ+mI
+w4GIt9IfvcN0ea5OQqp+
+=Wpnm
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild
deleted file mode 100644
index 2df8d47bcfcf..000000000000
--- a/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild,v 1.1 2015/04/20 20:51:18 vapier Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-2
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-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 selinux"
-
-RDEPEND="!net-misc/arpd
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	!minimal? ( berkdb? ( sys-libs/db:= ) )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.27
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	epatch "${FILESDIR}"/${P}-tc-show-buffer-overflow.patch #546928
-	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		ip/ipnetns.c \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	# 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() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	echo 'main(){return setns();};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'main(){};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.0.0.ebuild b/sys-apps/iproute2/iproute2-4.0.0.ebuild
deleted file mode 100644
index 5ec4572ab966..000000000000
--- a/sys-apps/iproute2/iproute2-4.0.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0.ebuild,v 1.1 2015/04/15 11:58:43 polynomial-c Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-2
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-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 selinux"
-
-RDEPEND="!net-misc/arpd
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	!minimal? ( berkdb? ( sys-libs/db:= ) )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.27
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		ip/ipnetns.c \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	# 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() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	echo 'main(){return setns();};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'main(){};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.1.0.ebuild b/sys-apps/iproute2/iproute2-4.1.0.ebuild
new file mode 100644
index 000000000000..1a99656ee3ec
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.1.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.1.0.ebuild,v 1.1 2015/06/30 07:45:44 polynomial-c Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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 selinux"
+
+RDEPEND="!net-misc/arpd
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )"
+# We require newer linux-headers for ipset support #549948
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.7
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		ip/ipnetns.c \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	# 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 ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	echo 'main(){return setns();};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'main(){};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	cat <<-EOF > Config
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	fi
+}
-- 
cgit v1.2.3-65-gdbad