Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 131 insertions, 3 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 8ec0b51b488e..5eedb3b2923d 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.123 2009/03/19 17:27:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.124 2009/05/09 22:01:40 vapier Exp $
+
+*iproute2-2.6.29.1 (09 May 2009)
+
+  09 May 2009; Mike Frysinger <vapier@gentoo.org> +iproute2-2.6.29.1.ebuild:
+  Version bump.
 
   19 Mar 2009; Joseph Jezak <josejx@gentoo.org> iproute2-2.6.26-r2.ebuild:
   Marked ppc stable for bug #259927.
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index c76cbeb8d871..b98c272b6784 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX iproute2-2.6.16.20060323-build.patch 938 RMD160 13cfc8c208cd07b3db06353b42e77583f1b537dc SHA1 4b29a52e5c26648e1255dc3ad5779a0fd23dfd69 SHA256 d322b077a550ce851d0056738285a50290934bfe3d2a9aaaf6ab5036de99ac63
 AUX iproute2-2.6.25.20080417-build.patch 369 RMD160 ca40db6783ab55c63d7dc536b07aced302538fdc SHA1 afe58bc27f5e9ea5b0807fdefc6641332d290571 SHA256 b9265e5614ee5b4f01d4b5164f074634b5b57f8fe30370c1a5d7673627379a4c
 AUX iproute2-2.6.26-ldflags.patch 330 RMD160 0dd7dd7837120eb31ffc8b9650063c4f8c8f8889 SHA1 a2dead0f194cfa039ecab330b0a945748f894948 SHA256 c7206270a72a9e0aa66ddf641d10a384501e58b87917b1e3161f297349b8ec13
@@ -7,12 +10,21 @@ DIST iproute2-2.6.24-rc7.tar.bz2 343912 RMD160 227d16911749839d37dec53e63042ca84
 DIST iproute2-2.6.25.tar.bz2 359144 RMD160 1f1175f187901de388bf300bd138f76af38599d8 SHA1 c73943aea21c047e3fe2e933b5ece3fcc8a20e10 SHA256 dc0e0f66c0928b5b4d4ae6bc833f3b21d0d4f5dbdaaf0711e42497bf50294512
 DIST iproute2-2.6.26.tar.bz2 359574 RMD160 9a6016ceb5d8a87c4e951463faf5d7dcf7731a9a SHA1 95e0f528066eae7304b5d7c610348b522628c92f SHA256 e4468eb1944ef66eb994e9fe3505fe09957b8ab98929287c12c9920caf95137e
 DIST iproute2-2.6.28.tar.bz2 365502 RMD160 8798b9aba50f92882d5aab234801e6ac41305877 SHA1 303601cf70caf61ece62116fe6e3370f423aa134 SHA256 bb54e0abbd4b9b5a928bdfe17039d3e2c42a6d42fd5b82b454b8b72ebba35cb3
+DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71a4a8b SHA1 b6a43799bf5e8131307cf88b855031317af90eb4 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b
 EBUILD iproute2-2.6.22.20070710.ebuild 2697 RMD160 9ff9ae78130f6e6f843944f4b83687530d00d260 SHA1 864e1f14cb1d5ea7c6719991a280fcaaeb3c0770 SHA256 74bbb34b55d768fbb6478442f4a3ba20df031e7e97ac45527cadd2df6a3a3223
 EBUILD iproute2-2.6.24.20080108.ebuild 2537 RMD160 b9dc98cac16ec225f18979be40b0e9cefbc4d0a3 SHA1 05115241fe38242ac25d180872a4ade4e140f49c SHA256 7806732fa3a3b29ef8be76ea2abb3159ed820a3281fa9f4c8b836c736df97420
 EBUILD iproute2-2.6.25.20080417.ebuild 2687 RMD160 818a3827b847e7568dd457c566b1dea65731623c SHA1 78027cf1c73f9d665b66d32cbb29b0ad3ab945e1 SHA256 83901533961d70f5a68d72f6260d672daee9689c71ee4f686652c402e452649f
 EBUILD iproute2-2.6.26-r1.ebuild 2682 RMD160 37946a9c850ed14c32aeca1c9d4c927f4aa6d9fd SHA1 6cb5a08ef4581902ec41a3b47f930f09426423fe SHA256 575d6dccc496b502b0b9594ba92ffefabbf782477b739926e8db5fd9640591e9
-EBUILD iproute2-2.6.26-r2.ebuild 2846 RMD160 853841dc9ef2539430ca38cb92a8873d74bf2073 SHA1 c6971017da6edb8e717b09020bb39a8b353635c0 SHA256 c9c1f10f7c1d1008d3e391ee698f6dbb08f3dfcbe0bbab9b82b18239e627c8d4
+EBUILD iproute2-2.6.26-r2.ebuild 2845 RMD160 4b2fde3099f6210bb46766558957b758a46ea8b8 SHA1 376c035860c61ccae84137b7945f543864dfcf7b SHA256 1feca0f52303a87a69af5b99c17263af67389ff5193f73db6fcc91d48e29e48f
 EBUILD iproute2-2.6.28.ebuild 3045 RMD160 56aeb7c85933f96564df5af7e8d59d51cd12b733 SHA1 7c8ef79321cca8f66a2d1d5c3c5522df9d98ef77 SHA256 0d49738e840f2f4c81ccffc33bc583cce504551a5a6447caa2c7ac8389f22959
+EBUILD iproute2-2.6.29.1.ebuild 3057 RMD160 41b4643076bc769b30260328162c278c78c1e40f SHA1 2cbc2e90b12cde60bef54d8a77d54a5a422b5d32 SHA256 4c56c445fd870d66c6195393096248e62fbd8ced45eb62f29c86b80eefe1cddc
 EBUILD iproute2-9999.ebuild 3043 RMD160 dadc3ac95eed39e2a7837746a4aaa098e0f9b0b5 SHA1 14fe922db75eb2a584de93cc31a71bd2f4d1a719 SHA256 5405d8a0e003b2ffaa620619a79e52d7c7ee72c12e18d4109ff093bdc809171e
-MISC ChangeLog 22192 RMD160 740fe57b24c0b9e724d86eec41c9629eb16f1a0a SHA1 69ffe3ae6b453463d2355f356a736f14236eff62 SHA256 4617797285b42c6e4a4d5e722a05c80c4ede741fb5f41ec82ded8cce9f3d5b2d
+MISC ChangeLog 22320 RMD160 8d301bb28e8ce9a6c4d4f1f72ec1bc372aa91ecf SHA1 8b2a3183bd2d179fae4bc462d634247673d0474a SHA256 5b33df80b39c82b9073e3b787f53fdc272d5790152d72ec3764a74d67a393817
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoF/UoACgkQn/5bYzqsSmEgSQCbBvnBiVqfOQWeCQmVbjUYUSRR
+NS4AnRE+R+A44tY8br36tUrOY5akEnsG
+=C0+T
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-2.6.29.1.ebuild b/sys-apps/iproute2/iproute2-2.6.29.1.ebuild
new file mode 100644
index 000000000000..9ff3c7cb139b
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.29.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.29.1.ebuild,v 1.1 2009/05/09 22:01:40 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+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://linux-net.osdl.org/index.php/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 )
+	>=virtual/os-headers-2.6.28"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	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.26-ldflags.patch #236861
+
+	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
+	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
+		EPATCH_SOURCE=${base}/${CTARGET}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
+		if [[ -d ${EPATCH_SOURCE} ]] ; then
+			EPATCH_SUFFIX="patch"
+			EPATCH_FORCE="yes" \
+			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
+			epatch
+			break
+		fi
+	done
+
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
+	# Multilib fixes
+	sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h
+	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
+		netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} include/iptables.h || die
+	sed -i "s:/lib/tc:$(get_libdir)/tc:g" tc/Makefile || die
+	# Use correct iptables dir, #144265
+	sed -i "s:/usr/local/lib/iptables:/$(get_libdir)/iptables:g" \
+		include/iptables.h
+}
+
+src_compile() {
+	echo -n 'TC_CONFIG_ATM:=' > Config
+	use atm \
+		&& echo 'y' >> Config \
+		|| echo 'n' >> Config
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		|| die "make"
+}
+
+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"
+	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
+}