Version bump #409995 by jrut.

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

4 files changed, 123 insertions, 18 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 334b7ed8cf37..30f2dc4ef5d3 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.185 2012/02/16 05:21:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.186 2012/03/30 21:00:59 vapier Exp $
+
+*iproute2-3.3.0 (30 Mar 2012)
+
+  30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +iproute2-3.3.0.ebuild,
+  iproute2-9999.ebuild:
+  Version bump #409995 by jrut.
 
   16 Feb 2012; Mike Frysinger <vapier@gentoo.org> iproute2-3.1.0.ebuild:
   Respect CC from build env #401907 by Andrey Hippo.
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index c9b09bb90b51..9d63ec2fda73 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -14,28 +14,30 @@ DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71
 DIST iproute2-2.6.35.tar.bz2 387193 RMD160 39a4eb0b07fa5b1ddbfc9f31f4053a5e777e8b97 SHA1 862b86ac73ea696867675765d119654553a22aeb SHA256 8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3
 DIST iproute2-2.6.38.tar.bz2 390166 RMD160 7c59dab852cd4c6eb685ac778c1e27d7e59d9b6f SHA1 e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a SHA256 47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4
 DIST iproute2-3.1.0.tar.bz2 404147 RMD160 8ec8fdb6aabad462a70a33b6e915281fe6558036 SHA1 dbafdf6fdfc6c8cd2e9bb704da9110f310b03c37 SHA256 c9d6366a3835a244008170e6d7752ca08414270175fce575e4f516f057688df1
+DIST iproute2-3.3.0.tar.bz2 416353 RMD160 de8a77e9c552e8ebee3bab1f7cab2a48bcf471e4 SHA1 758e84553ee348358bfd38e5438c7e90df08ff2b SHA256 f328ec01bac64854f477b9440b0bbeae91895b4ba266821597ceac6bd1501c3b
 EBUILD iproute2-2.6.29.1-r1.ebuild 2737 RMD160 390ab7a08c245e50b6ce69766a812225b52c4bb5 SHA1 417f0dcb0720eb0d878ffe583a391512cefb887f SHA256 3652c262e52359e898b74f3eb428ceb9690c3d6b08c76654c7b35a5933695e40
 EBUILD iproute2-2.6.35-r2.ebuild 2611 RMD160 d35ca09dedb9eaff75703cbd1f15c0eaabb3b9e1 SHA1 9938aa61a7ba97cce8007502cf183d95cf60b62d SHA256 5f14ab7b77672d49df8e9648975613cde048220c915670cdc4adb0610b54fcd8
 EBUILD iproute2-2.6.35-r3.ebuild 2881 RMD160 32368f70d63f5675681df3fcb405d141b20d7272 SHA1 479bded179abf64ba1dae27c8cef1b38ea8dc7a9 SHA256 de74bd52f5e4c975030e74072f8651b12d91af7076e111b44cc399097fdfb1b9
 EBUILD iproute2-2.6.38.ebuild 2256 RMD160 6282620f1b3ac9d2ae03aaf28fada45e6607026b SHA1 7fb1a7996b0bd0d04bcefa5e1fee2e0f8aad64d0 SHA256 6ff28a5a1fe138c5e159c641ca32bb74cb33c8ec7f6f1727c7ebe849dfbc3a24
 EBUILD iproute2-3.1.0.ebuild 2422 RMD160 0ab928d701a117db30b6cd4676be5a8290d464a0 SHA1 8a56e8ec41f2f03f41e907773cf75f17275504f0 SHA256 689a46f538851963f58265098db71a0088a6a3dad62fa0dc6887b80c5bd9403e
-EBUILD iproute2-9999.ebuild 2404 RMD160 a1794d19f8eb4b1635253288354404aad837b3e4 SHA1 350297730f6bdddf154546cbbb5635a7f7f3b228 SHA256 7369fd2ef6c468db1fa27cf884a0eeac92750faa37c7834a0bf594e9a191c075
-MISC ChangeLog 32275 RMD160 791f80983fd1d18367d6933c899582aa6c072ecb SHA1 bfd24e0fbd13388e28ab889fe8624ce46360fd59 SHA256 b7e3426539a1ffdea61d17242a130c92a1fd3cc0d813dc35da94fabb40d4949d
+EBUILD iproute2-3.3.0.ebuild 2473 RMD160 480293c3a45182d3e5867dbccb82524c87011a23 SHA1 a7313b73ffaab768ae775f15c84e201b8696aa09 SHA256 0325d9187b3ab2b0059fc754ccd62da7df5bfb3b1c3295df7b318a52fc95248b
+EBUILD iproute2-9999.ebuild 2422 RMD160 8b73b2beaa9149d09e21e01392defed26e10f321 SHA1 1bed2e5f2e66c5555452304e674f738498d62727 SHA256 4466e523498dcea34c44fffc20e6e4ca99d90eab98ddb010b8101c969a94c35b
+MISC ChangeLog 32437 RMD160 552ee7fe1eabd6971240a3502a72dd833b1d7ba3 SHA1 60049affcf76c0f53d8d9c65377f5b804effdbea SHA256 82cc2c2b5a33c01360bfbcd39567caa0cb0517634e729e2c891c52084158a682
 MISC metadata.xml 246 RMD160 f577c668ed7c33423595f7d3db200a5868749b60 SHA1 7727cd7938065c32bef28eee0e3ef096125217e1 SHA256 f081ffa604caba81f8229deeec7b8d4694d83c059564d7c941f7b942b8385012
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPPJJlAAoJELEHsLL7fEFWJ6kP/iNKVqbc/Gj9RK82S5cTuItD
-5/X/OmaEsdMTPerUN9mapcRzQ8tkQ/l9xc3H4Rn9n0uUpyAhC4ZT/f8mh1FjuIPL
-6yHqg/cKczGKYkpKKP3KmndGxfqUpIGQixIWyrU6DFyTAxBbj31yThDdOp/03OtI
-sFug9gnlWrxFnhzcw7R8iRJGu5JMCua2CNKGy+tKACho29+7TT9109zw+iyMSygH
-gRCx5sHCp3A4HmKMQRv4YVSrTDLPBIoSRcHySv/ggofGWizf8OmO4acRTX4jO13k
-H2qG8Xk2mP/6LYbg5XoM0qA7JToLKLtZStKKiI7ms7f+V+tjaa+BCh27tNhp9F56
-o2YcAdV7ugc6bkq0KANC9w8VuqdCgMGWHuclRaFW4J+OXtlZr7vdlW05WHvuEe+o
-wA2uJFLnSbHPYWf/czl1KQh6WvkDks+FLWA9/60TasGqfHCvtZ3Gto5FmfgKSM/t
-GSD4NQhH9529YTVQQyfnxdsx7TaEqHJsWImGo47J0YYm2D9tWSmimxmzt5qyh98S
-6u7cHKlb5oaJdVC+6al9CGMLcgw6dR84Xyyf0xpgFTHJmFcDznz2OBQXylce+psv
-x8gFZi2B/48eTZZYUjroyB8JbwIc77yykQfLPjptNkA6BBoBJYdkSXxXG3moZWIb
-d0AIcubp9kjZvSxNJHhx
-=FzsT
+iQIcBAEBAgAGBQJPdh8aAAoJELEHsLL7fEFWjIIP/0rQHEs+4S+pnRlTOui7/3aj
+kDYffSsCJxCPp4d6qrBOj5qA7DMBrHKzn02zjsFj1cce6BnlfB/Tk9hXY2ffYuLc
+Oe2oHs/yVu7hUPJ0vOnN9/neBjMjRDKf9JYzXV+UunfST1kRd7YnaljcLmi6AYdS
+6Z+xFm8JsLF4AwAdcdugbHENCvcH4D4JK6aeiJ1eSVJRUuqJxx4aGgtUJKt0Alq6
+LmkqHDoRGthZ5mCxk5CiMOAy6eFgJnGSgqC//f61u/nDRfL4aWDbqUEy8xbn3K2H
+yAyMBh060ZMuirFUCkxwoE0f4XOdlvvpWy49DDfH5apiXt9e5FVJMpUDBK/8N5pT
+VFN1AMnJbjW6g88lEuS0qr2zfnO01G5tnCxVVcgTruGROsf1ZYiKtb+/7oY1++7g
+M3HKsHxiuJZHAGXRUzV0pbLa7GTP469EblJKAUp3QX7czFRjzUcFz4lF9iFo18WB
+IgodpOzwOA92ieaLXKzlaRB7sZE0b6j1/AE+Apf2DzYxI2RhO2DQv8SCAGtCrMUc
+PTzbdekKcqHicL4TSlMKXsS4tfIa1O0R+QxXpFZ3n0hQH/hxdBlyYNxzReqe2ipU
+rA7by+lgnzqJ9Zcl0Bw7RK4jz5XYH2Ga9GbgXBzjXg97hGSwbx7dgWJBURKX6Zdg
+wVCNq44lNu1+VmcYF5bt
+=JO9Q
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-3.3.0.ebuild b/sys-apps/iproute2/iproute2-3.3.0.ebuild
new file mode 100644
index 000000000000..ab1a974cade1
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-3.3.0.ebuild
@@ -0,0 +1,96 @@
+# 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.3.0.ebuild,v 1.1 2012/03/30 21:00:59 vapier Exp $
+
+EAPI="4"
+
+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-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2"
+	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 minimal"
+
+RDEPEND="!net-misc/arpd
+	!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	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
+
+	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
+	popd >/dev/null
+
+	cat <<-EOF > Config
+	TC_CONFIG_ATM := $(usex atm y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		SBINDIR=/sbin \
+		DOCDIR=/usr/share/doc/${PF} \
+		MANDIR=/usr/share/man \
+		install
+
+	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/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 b4d22821b958..e3d954164c36 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-9999.ebuild,v 1.19 2011/12/05 20:59:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.20 2012/03/30 21:00:59 vapier Exp $
 
 EAPI="4"
 
@@ -36,6 +36,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 
 	sed -i \
+		-e '/^CC =/d' \
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		Makefile || die