Switch netns to using /run.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 145 insertions, 15 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 24c8181f1158..d3f58d29f36e 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.233 2014/08/07 17:24:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.234 2014/08/27 00:40:17 vapier Exp $
+
+*iproute2-3.16.0-r1 (27 Aug 2014)
+
+  27 Aug 2014; Mike Frysinger <vapier@gentoo.org> +iproute2-3.16.0-r1.ebuild:
+  Switch netns to using /run.
 
 *iproute2-3.16.0 (07 Aug 2014)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index e4aab90b1276..a401d4a7cb1b 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -43,6 +43,7 @@ EBUILD iproute2-3.11.0.ebuild 3451 SHA256 3ad18ff4f9125108aea90d6dd1bb22be9fbb4f
 EBUILD iproute2-3.12.0.ebuild 3453 SHA256 9b2e7ad20188199d87dcff2e9974b6485e7241275c526b717f806599a279f8f4 SHA512 b286c8e4897e48d3b487e0084a51a7f2ef25c3420d9c453c30008f58bca450422e476e4e8a2dbb5f781d9e4d786a1f544e7d86cb561567318ca3fafff4cc54fd WHIRLPOOL f884072694e38c3695a20761e2dd4b38ef11d16c32378cd154b8a720ebc0199967b66cf7ebd8d485ac6368c503ed15b994e80beb209c06bcb5f1ee6ede81431e
 EBUILD iproute2-3.14.0.ebuild 3536 SHA256 5e8d13b17d1dabcabe05c409f552e4c792001b29acec8c2a5fcfcae10feca686 SHA512 6e81ad929fb1055d84498e871f2833dc76458792065bbac51e876de5da9f8e5c001b86f5676a5445345a32df326eb34fbd52f2ccd79a79fdb30ebad3fc13376c WHIRLPOOL 8222fdc054744289c28a45e58f01c122953c6e9d905ea8f7c5cbd33ac5978d38568cdb487b0a8bee599ae38ba62e4a1db81f8fe64852b5d3ef1118eadc79fc71
 EBUILD iproute2-3.15.0.ebuild 3536 SHA256 116b97876f0532c41f10c0a4f3fc456bb09ba983858e8e9ffc10ea64c8032449 SHA512 b2e8c74a52e13fa52640075e190707a90dc32c2fdd627f3f17334aafa98f26264ecfc477b254d25a39a5ea0dcd2329f9a1f18cc3fd89fbc21765ae91354d1407 WHIRLPOOL 51a40881bb40e60421699678a0c5695adeb911b17fe1012932c751f7af3d8c6e0c504b1a89662c6e4894a255a178f1843233dcdfec0f4ab67ec1e46d7c474867
+EBUILD iproute2-3.16.0-r1.ebuild 3653 SHA256 a42a1460ebf20fcccbddf227547c6b81fe92b4cd224d26a001e0a4d5cdaac276 SHA512 1d41975dbdda2d8292f4dec0f3b24474e31ece557764d56e152e69cff68b43cf2591e2220fe1e13307ef1e83e491b77c30ec2070b2c59d20ebd515aa3fe9ca40 WHIRLPOOL 66dd1f02a6cd9e776f236daa0bf2557b6a067759cdcee90f7e459ec3cbc0cac926c4535ebe5fc8316171cc6ddad180033724b698cd1fbabf33ddc4d247203a6a
 EBUILD iproute2-3.16.0.ebuild 3539 SHA256 b7d4b5aa7cfcd93453113ead78d979c197a14f53640fff76de5a294a720b0fd8 SHA512 0979011154fececebe6f1e17395334ff8ad2493b66c47b382bddf402d8edb9861eadca54845fd8fd95607cd5ac736d8e1613f64512e1914a79e46e7d7421804f WHIRLPOOL 9155c7b054b0949ec6241257bd095d929e1c4a6369332705ae778318715bbd8388aa145a359da580e7d5ce8eb36ec63aa899c5ebbe3b8dd8d0e8318288007cd7
 EBUILD iproute2-3.3.0.ebuild 2972 SHA256 1e09b07a850aea92e7e57a0adef53246ff7cc8d8498ba7ccadf8eb0cd814bebc SHA512 2ddd5321a9f378322b72fe5fd9dc7c45b6e2ef26cacf42f5d731127b8e249495e2adbb36f1972174424f28a493b4a82b5610add9961855a8559d746cdbab9eb0 WHIRLPOOL 5c3716f6ab9a18e2fea0e8acaa0e2bd347edc189e2b485e61f5373327c7f675499f7e239961697b78e21393dcde2a5994c17c420c649b3503fdfaefbcbe1fa57
 EBUILD iproute2-3.4.0.ebuild 3002 SHA256 345f9a7580ed2bb81811c60bd2a66ea580b5b10ee4dde9c3abc22d7cf21664f1 SHA512 d1dbef1e35df618cf9ee1647048f258d5bd7dd903d7face73b948293867189889fe99365d4d0e66423ccfac59ae3c271f7efbd5af37b339a944afe10511043e9 WHIRLPOOL e2edadcee3aa3bb4ccc6668e7edb32125e888f8ac0b6fa0753733494829a26f5cf70d44894b4992856210f0d85d5e4711f36c527899990c24ca19e876abbfead
@@ -52,22 +53,22 @@ EBUILD iproute2-3.7.0.ebuild 3199 SHA256 f56b5e5c51fb9973041da16383aebc579a99c9b
 EBUILD iproute2-3.8.0.ebuild 3493 SHA256 e9fb3f69673cf3e6cec6abf83ca59bbf84af19547fc5245e23f9b8af2f8d6dff SHA512 38180309ad908833407c6fa681aa4e7b0fa5e3723d8a4d9667d161adf8c90fe2a6565c82989a7681179b8943553ebd71c8858b59f1b545465189df1a4e7b4682 WHIRLPOOL a59f47eb73a56790f9314ed386fb18eae47152d1d7e4d986ee859ac59eec2798026148ec691259e0ba6011f31f0f965af9846853b670f245de3496bfcd934c20
 EBUILD iproute2-3.9.0.ebuild 3448 SHA256 d39287a123200dc4a5a876e6b9a563416926c3f647e5bf547edc655365e638fd SHA512 a4709e9dc4f5f4ed08aeeaf2dffbb54795884a2dbd1daa52bf10470ab42702234403778b5dd9eca6af89e727975e49d6c5de3c23fb16ce1b962a968e6164e296 WHIRLPOOL 45cff8d41fb0498e68210090e372acef8000f8b42b4787c5f10262b5265360102f4f1b45090e9202924da085b8a47597e4c196dc3a198f9a1d746d9300e33b86
 EBUILD iproute2-9999.ebuild 3062 SHA256 10aa54bddb521f3d3a37cb07e3ace119e1ce846cb63c5080da8d683c78190bbd SHA512 f01b7583c50e1b2d464aed3be7162e9a7ff59571ea13384b1555222bc6670b83577af55eb835b6e82de66ae154b1965418a76d42295c49130d264971c6704236 WHIRLPOOL 49a9699cfd677a8df2084a104eef77c720de6ac3ad8556f2ce3f22f5bdd2e786d5056001a6ab53d5dc8209c56ce331495c37895de5a29c4c9bbf0959dc2e4637
-MISC ChangeLog 39179 SHA256 1a682593903d183693795845b4e68882a64c9dda2a3b27ce8900892387b4cb7d SHA512 a125afd6baf3364c0d72bd5df006901a15583d7add696736011d7efcbed6980ee1966898ef385cf46f7b1d6defdac70149ba9a5c5fa51563f1a13ba445ad5f8c WHIRLPOOL 7fec53ba99fc2025c2e90cf72d4c695c8321b68141a239fb3e46e0dcab987b3995432d8b764e102fea2192452cfe2430015c1a55fdd24dc8ef398fad8cd444b4
+MISC ChangeLog 39317 SHA256 ffa7cf8e749d1b3151c0809191913451d5915ac443e4b89d28e1ecc6e1096524 SHA512 0872574b051ef10b039ec92a9432ccfe07a8c0ffde7185853a0f31ea763d39aa823eaca0d94feff464e59432853d47773c157289c5692ffeff07f48d27663358 WHIRLPOOL 0793411ff16612bb0058f9653a9a12a0f5a5fb535eb0955a969aa88b0ec1fbf3881996d054f29ac80f6c2eb8ffca1595a97c76cd80c6e0e1efab277311024571
 MISC metadata.xml 317 SHA256 45312a0c8b9363b8eaa97110513ca39053ffcd967af978900ee0a01aa81c00aa SHA512 2e6ed50522276dd0b09a61ba0c68ccc226ff33b64da2af87e92e349354f379cae040eb753961aeedc2a894eb65415fba7763541efe21bf328fe0a69706aeb872 WHIRLPOOL 73003e9201c29cba545b3245b53da9c36dc4b3c209ece693a9401b954896f6db5d29b209318fb7dd1c33db8920d01e097feaa88ef4ec0cb07590e850803bce09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT47ZbAAoJEPiazRVxLXTFtqAP/i5rhfLzpiLrJWqjhpWjBzWP
-i3QcbhLLtxIQYd90JGkilvxauQUTa49z6ZPBCywVnamFYbIRay15SbiY2tzi2ovt
-jAZgQq8jAVOw7HWpkBkBASUeAcq5cxKIW9ZGywS6kIsJhr7+K/f1V59TQyev/hWA
-ZiDLHsmBsA1pOsve4rZezVK4TuIUWuCNTI2U5bbiHRX3XxC94SxzVpLPBgX9l5Wz
-oDVNZMD1xUkPBq4V2ISNQUTQh7jkxFHwpFGT2Xj9BjlE6qDPlgLychgAkKFZ1pWI
-ivk4FkOBXq2flvxf8lpf7DTteP7Z1DVqjwM40QQUY9+WlEi/qn3SQYFTmnWJkF0i
-Ac12HvJ9NUDH2mnny+wvpxjYdKBjOx1S5+u4WTBlndVhGX13cR/HMSDhQ4vfHI9m
-npCDQEEC2A2QnalalBtAUSNkd75ajr32wdzYD35c23dJ/1nilqrPGSc8cJUFWMPq
-ikPNbleuxkR/bsVqdQQs4bQaX7xz5Q1MCV/n+qDWMKG8Ag86V64UWwpUsFLp0s3q
-78BnbOPs5ruYopsbXxCmDAA5i4MdPvsDrVq78Dvt55sAvXc5tpgEuj3XFSbItvoy
-lrcXQlR4DL5DxowPRw0tIziwDQG/YV8aIPQoa260JChRlqwFWW4csPE19XRf1cn4
-hXtvcL2b2jjwQffcT/zt
-=JCnA
+iQIcBAEBCAAGBQJT/Sj3AAoJEPGu1DbS6WIA9ecP/RMEcql97dmRgjZtUlOp6Da3
+rwxynxGsCJQfBQ4eLxwFQJEpsQQLvRHi6jDxd1Uug0X+zQSuKtlFYeSsS+UQQu5A
+GfUPzX8ah1MyWKUec8Ma5bYzUJaC6qoVJkKUW7/G+kAj0t+/1BMKHk3HiS/n8W/y
+eXYwarqVxDagDYDlm9oAvkyIizy/WcAPMuF9VDU8mkDBIGaGsyXbbNbaayw1CKSu
+dQrDsFGcD56/CwYbdCGyUB6wokhZm8tuUwNtUuUgObwoM28W6yYy7Kk/oA4XmpD1
+eK3s6pc9LylCk69J3s4VacwdOg69rZqa1edL2oaKxHEOdgeT965AV3LWzoJ/klv0
+AC7c0sOwvz9RRgJtfuKqtxic235O4vaoUDU/1Gof4mA3LjekXI6U8Q7XplnJ+yN/
+ftv8yct6bKa60zY3VZznZV5FOQOSAMTNV/LLdZURBSGn/QI7sTHQk7Qkso6lAo2T
+hY5evQmzUnKMpPkXML3QNpEvlLfZewzEvjKUkqALMItj9zA4rVGOfvXXsrKewz+J
+1HD4v1vitFTUJN5Y9z8T4d0ozLildZueOE8DK1MNg8CsxVsDozbNCzAOi4iFR7xH
+eLUOo0ZuujuPjbw8vNDdtJyJcOiYYsE/ToDUhOJbP0TxyPtCLy+gCSl2NfXdiurh
+URSQYoBHk2ZgrSZM4nth
+=4nfX
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-3.16.0-r1.ebuild b/sys-apps/iproute2/iproute2-3.16.0-r1.ebuild
new file mode 100644
index 000000000000..bed59f1f9aa1
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-3.16.0-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.16.0-r1.ebuild,v 1.1 2014/08/27 00:40:17 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
+	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
+}