Version bump.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

3 files changed, 118 insertions, 22 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index a2130163dc2b..c027d42627b6 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.201 2012/08/13 18:08:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.202 2012/10/09 04:30:46 vapier Exp $
+
+*iproute2-3.6.0 (09 Oct 2012)
+
+  09 Oct 2012; Mike Frysinger <vapier@gentoo.org> +iproute2-3.6.0.ebuild:
+  Version bump.
 
 *iproute2-3.5.1 (13 Aug 2012)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 2a2342785d93..58ff0ef82f3b 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX iproute2-2.6.26-ldflags.patch 330 SHA256 c7206270a72a9e0aa66ddf641d10a384501e58b87917b1e3161f297349b8ec13 SHA512 f85761a4e6861bb0b66a455aaf09e7bf13a0df8f05f62207390a53a4587a0a52418469f8478989d7dcf3c640436e451fe7f33dfa62ae6ca87648da3990fd3275 WHIRLPOOL 6eac5c446cee82a785c3770790ade86960ba99ae17cbb6eb3d6f8cd50cadddc85ff9f3da70d212c6b42e12e725f9ab2f3ea4a219b846d67b8f79ea6e8221d096
 AUX iproute2-2.6.29.1-flush.patch 5669 SHA256 13007eb0335e4a8a88f4946cea9fc61ee4fbe840ce308279696212b11aa1928a SHA512 e6d9898f420386507938f12b486383ecc057dda2862117372b0481fd7807d89bd14f8d6e17cb84e83b0eab7eadac8662e6d4da9d51acffc6bc558ccbebdd7157 WHIRLPOOL 1153a05968f3a17b44653bd673d717044cc445b97a57873055971ad3903f8ad306935edb227aed4c3e277907d92171d61f60300d6ff4b437ba81ea12af26fe40
 AUX iproute2-2.6.29.1-hfsc.patch 37615 SHA256 4d41873a00841749a47142dc5591572b2d7df3b4d4c56d8dcebeb3c4cab30672 SHA512 98a4778434d0014c0032dd6cb82c8d616406f36ab8d6b5269046b5b5bd12b7fd0b83aedaae2c95522a23c1df7b34fcd0ac2e5b39fa23ed66e98970c794fe461c WHIRLPOOL 99e09caf201f710ef1d99418f736cf56b0033db0fac9c2c2e981df15eec5f8d38707c54a728d220d770e2b2e53df9ef97f30ae1556165f55bdc0cf9687622350
@@ -18,6 +15,7 @@ DIST iproute2-3.1.0.tar.bz2 404147 SHA256 c9d6366a3835a244008170e6d7752ca0841427
 DIST iproute2-3.3.0.tar.bz2 416353 SHA256 f328ec01bac64854f477b9440b0bbeae91895b4ba266821597ceac6bd1501c3b SHA512 825b473e3fb17cf724bc389bb99dabbdabf9c5bfee89890f723027f3412a82a9c7f77ac8b792a218ff50dd552e31105206ccff1897b68fe201d83e5764032feb WHIRLPOOL 7827cb8d447eb86d89dc14dedecb94d7e1a9fc9380ee2130d28047f834f5b96045226409448a8f159501f9bd20b1eebe7c32ae17d5687c4c071459ae9c807ebc
 DIST iproute2-3.4.0.tar.xz 382092 SHA256 38e846e412b2fa235a447b50c20ad1e9770d1b3ed4d3ab18ca0b18c6e8b79ba4 SHA512 b0396ae65faa4b1966726110506fe93a9dfc4584c3287ee0867ae2d010634d0231ee6513e61fb8b0eb3d50d67ec0e1480c83c27ceb005f579df57e6d51f7ef66 WHIRLPOOL dd9d3c36e69ba840b251cd93cb605d69808851c53a0b347d6a1a1e27ecb4c3516a9c3fa943d56f5bdbdb2a545eeac6feb0be51aa4d14d07f1d07d15b764826c0
 DIST iproute2-3.5.1.tar.xz 387984 SHA256 36f2674e5436289f3ccfb0a58707aca9dcfa295d06afc36d2117674508f5ef72 SHA512 e94356d07fa6f14fe9531a39b53739fd3a293c381dd4916cbc4722f1c560c2bda5f4d567967bdd4898fd13e74a8d1773d62bd5e6072b764d3032d464cba961c8 WHIRLPOOL 37fa6430f0b604b5b623eb5ef547895cdf7ec147863e15dc2b5ae6f56c85d146b7caee9cb6516083c2f7e952f8343a2a7fecf3a2f606c4d10ca9cd7ffa6292d8
+DIST iproute2-3.6.0.tar.xz 395096 SHA256 2d17544da00e3f162139f66891c6ab5492d3cca7cfc8f7b517a5dca3c5560534 SHA512 bce4ca6efd0ff9a6e6f257fe57008bd106674aa8143935687ea2d2956fca2eaf5050f89fbc16b96fd91530a8c853f319d4cd8bb021c67e19ffb679c9b19ef15c WHIRLPOOL 98d6015d0a55ddd4695171550d33f074acc586605d6627af4e3302415caa8d1243abf47ca70b0a6a5f57c505f29be0fe5a281914b69aaa6a3cb34e9abfe1f751
 EBUILD iproute2-2.6.29.1-r1.ebuild 2745 SHA256 4ccd35f63ebd900de9b307196bdb1ecc1fd69485fe729d3459093a620f2a3a20 SHA512 dcca2b092c388cd909c1916e44a0e565b61f8a2656ee20191e2eb875ba5d7311182d44b00b6d147bd9638dece7364418524e13728dceced2fd1c28fc7485b6e7 WHIRLPOOL 95a8dd6ac557bfe11ac53d6d788ef6883459c1760f622fa898f0a8473d79eeb59caadb86ad9812c243e22d89b991aeb08b255e08fc77022ca05b3b7d1c428aed
 EBUILD iproute2-2.6.35-r2.ebuild 2619 SHA256 814d12bdbca6a20899835b41053e77a853c2964dcdcc5d799ca67f2966a13eb9 SHA512 e713e69477b9f507afe4de48e2862ef741f9a05c054025adc14b4d70c991b5b893a80e3740fd8f6ad63baebfdd32bee8e0bda85fc26f516b04459788788e9696 WHIRLPOOL 17ba37486685b865dab34cb028ec80211232237ddd5e0404063dc363fe6a26d01b2a345e32a423619d947dbf386c179316b1df7a998dd3f5bbd580ba24d2d73c
 EBUILD iproute2-2.6.35-r3.ebuild 2888 SHA256 1296925660848e80a011759ed87b4319aa5cbd22eee0668e7a1a3d29eb1aded0 SHA512 c4fb1160f11ae58f08e77c3f889255ca8e4962ab8f7837a3dba1f90a9bbb4eaa43a37954ee0e1590c0d0d29ea23f3e5220f5b8fd8c0d59eccfda46b9c545d6f3 WHIRLPOOL d13047532ad6b7d9f942663bcf436eaf7917a87d9151542d343881d9858661800e596323b70e70895cd331c4de644aa954b00b36748058c87313bdef9013f469
@@ -26,23 +24,7 @@ EBUILD iproute2-3.1.0.ebuild 2781 SHA256 dd626ee648fad23524fc67e08652645f8178d34
 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
 EBUILD iproute2-3.5.1.ebuild 3055 SHA256 90734a1a0822fea2d81649a2c6f06aff648903a393cb57906b560b16da41f02e SHA512 07550ab66ff8aef3afb76d5083c74548f77f9cb2a944261f2b32756011d25bafd4c83b5fafc1283ec0a96c564d84020a6b8381b55dcefab9d03fc426f31b6682 WHIRLPOOL b39b2b78640f59b7dafe3904ff245b298a9e1afd7c34c3d55fd1073b3a583fcfe28464096c4666151ff8a64f94f778007d93f8e0d91795ae6a239cd7871164c6
+EBUILD iproute2-3.6.0.ebuild 3055 SHA256 ed6a0dbd89dd65b5d49f89804e457f0587e8845e6aa8c36e90f64ccc0b010d18 SHA512 f34c5e66bbbdcb2fdccea4e1631c92bce654e0efab95911e65e4d9fd447580ee17e601111873ffa7d59e989512efa518c22283a3fd26dd6fe2b020799d706c6b WHIRLPOOL 6f0e99f1f190f6aab05c04a7d1e4aa05083d31675860961d082476dbd2ca42966e336fcd603a58314a58646ffcf05173bcb60dee6c7d4734f9105745b86eb442
 EBUILD iproute2-9999.ebuild 2781 SHA256 f0f412903b121408f09043221d01e67cf3fff3b75d243741e75d33a896f59c75 SHA512 35bf694cacb3fd703f6ea28d780086b0080b5c3a0663d51e8a839535fdd1edde9e047b3f4ce48726e56f704f078d9ff5d8ef9581bde06c9c78099a43adf568c6 WHIRLPOOL 5253ae960058e13a6f359d7422611aa9b3de2fae928c980f04f30a9fcba80ea6d63591388df22e67b455e60f8a329bc336c63c3d7e59864e75b7d0177c01b955
-MISC ChangeLog 34675 SHA256 8c213b8ccb34079747cf250f9990d87b1add65b55137637f979600ebd66b11e8 SHA512 bf0f381a78f59a21c7ab7087300ae91829e508580784a3718fd7f98f8985d0f7ae43fe6e538b1a8d3d64e823f3b5372dc1273b0aa9932565c61542bfbd17ae11 WHIRLPOOL e55db77f654e01bc13357ef444b6a275c9fa33b6627aad322d9356410ac6afec3ff3266b800e38d0c0daf1258eaee7eeba3e67a7aa49a557cac59a0865610163
+MISC ChangeLog 34797 SHA256 8279c8a40d2368422b26d4adb4bf262d910bccadd36dea0fe57ced984c519340 SHA512 7118eb97843d2ef3226528f2ee2a288cca77e4ec0994fba171481ac0a556f02f7009c6fd787a3f155630b6c7a5006841f0414cecde890710c724f9068970c9fb WHIRLPOOL 3e671ac554ba4083e4d2e170ee751c51232375412cd13714d9aab36ea20f22cde112bad8288e00aedbc4f5904497a735dd64107885fbf23776868caf63cea52a
 MISC metadata.xml 246 SHA256 f081ffa604caba81f8229deeec7b8d4694d83c059564d7c941f7b942b8385012 SHA512 77c1cbd10e26f7663334d68fcdf907ccffd0252a847c3e090885745f8ab1e87b9698792176799ce7cc592af6baeeba1fd1ddb31f5888399dfa8edf2b08e502eb WHIRLPOOL c721b8410654303b96f723f0ab9ce23ddb84ad0d9c5b1703bf6507cb1b7a3beee45f876945a07386f15374caabb13b40f4cd1cb21d5bc51ff7416072437deea6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQKUK7AAoJELEHsLL7fEFWqV0P/RwTsjKBWCDm8SxmW4790Dv8
-1/pBLK7HpWbvbcaXL3jF6eQTXMRD3UQ5axk6hWJphZr9tCxlbX8/W2yEMrqpXrpb
-aY3AB78xyLnOXziNpaKSsIYAXHd0nVn0+h9X+9dZFvO1mnid/jc7qVC8y1yAPHF4
-Lj9buXvhJTpVXUp7XAf34H17UhsI383F1IGviM3l2pgafcTLHB0RjNE8B5a5CBDA
-G7J5zkV3hUDy1RTRchF8L0+FIIMHue1dqJDI3qZQwrDZlGVBc8ITRSGJn3dzBrNT
-u4gpjjtIwxxx2zNFNJyTyKKB41b0q6Uayzj2OmbeOIG2rRbAOJeKev8M5pg45oh1
-Re02rBnb1sAtSptNFaGNk49lVZDOXBYQrZrVZBJbex8GNwwl+5nBrKlOiHTIP3L+
-sT8iP2M+P6EHhU78fKjWw5W/IXzZWDeJEdwG68FqdbkicrD3akScn4H42J1lINez
-+8tHj4/Z3eBIk5QlK7OasYtQiwlB9dfQ1SloBOYwS/PdQVHxaxn+3EK1mknr84mG
-AEMTr0pNSSCrLW9gYQc+MbU3bW9aV+tFf6vAbjFSEMrX7Ei8T7dCibggwyHguo/6
-ZII7Y4grUdLSR9MMKp0fKgpBDUGrGl+3I5vN21M1Na5htjy4T0F+eAS1EgdzfiTI
-xaGMNDfFOunAcnNj80E2
-=SkYp
------END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-3.6.0.ebuild b/sys-apps/iproute2/iproute2-3.6.0.ebuild
new file mode 100644
index 000000000000..158c676e1c35
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-3.6.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.6.0.ebuild,v 1.1 2012/10/09 04:30:46 vapier Exp $
+
+EAPI="4"
+
+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
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~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"
+
+RDEPEND="!net-misc/arpd
+	iptables? ( >=net-firewall/iptables-1.4.5 )
+	!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+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.1.0-no-ipv6.patch #326849
+
+	sed -i \
+		-e '/^CC =/d' \
+		-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
+	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)
+	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
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+
+	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
+}