Fix path to iptables dir again #293709 by Vitaliy V. Osypenko.

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

3 files changed, 118 insertions, 5 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 93d515a26e13..1bb8518fd582 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.141 2009/11/22 17:43:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.142 2009/11/27 21:36:02 vapier Exp $
+
+*iproute2-2.6.29.1-r2 (27 Nov 2009)
+
+  27 Nov 2009; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.6.29.1-r2.ebuild:
+  Fix path to iptables dir again #293709 by Vitaliy V. Osypenko.
 
   22 Nov 2009; Mike Frysinger <vapier@gentoo.org>
   iproute2-2.6.29.1-r1.ebuild:
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 1f2a393f5678..1c9d71b15c7a 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -10,13 +10,14 @@ DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71
 EBUILD iproute2-2.6.26-r2.ebuild 2388 RMD160 0bf7f09d408c44a08f11a63465e6300287fb6688 SHA1 2d6960b768919015fb952f68048bda55f8be3af4 SHA256 88d8676ea22cbac0df3092382cceb533c378c8fc5df4a99b9089c90cfb7f4664
 EBUILD iproute2-2.6.28.ebuild 2579 RMD160 0d78d3c2f9f3ce06f82fc779ebf550e8ff949b54 SHA1 885d4bcc9612e990286aaa832563e1e2b22199c1 SHA256 30801a6620fc98d0061c6f869ee891e995e1a2bbc2a0eff7d0675e9a8bd8f43b
 EBUILD iproute2-2.6.29.1-r1.ebuild 2698 RMD160 07ef4f1f90180f8798f41bf9a30232496a3435c2 SHA1 40e57a8b59d6ebc2f35538822998d9d96765bda8 SHA256 86c0576b736bd68fd508a56277940fd97bdb314744c7e914eec78035035bdb4e
+EBUILD iproute2-2.6.29.1-r2.ebuild 2655 RMD160 bd6fff10d0188e57aeb5e7b94c2676ea386ea778 SHA1 e207d537b84ddba95de00d6cee2bd4105354b3c5 SHA256 09cb058ab178efb4994de4af77656682901201fbcad8d48e79581334d558b2f3
 EBUILD iproute2-9999.ebuild 2690 RMD160 763d209222d532bb08d3ab3f2515287c3b8be60e SHA1 14235c2f101ab1728c98ce6d62d593b344e25c9d SHA256 b926a05d568ad6719eeb380eaee6ecd3f3cdea764f3ca657cbdc7224504efec3
-MISC ChangeLog 24579 RMD160 a8de644f498d093ad7434de8d311b51aef258ed1 SHA1 10f5603201a66eb1b9802c985bd7c24f672ce30c SHA256 b1e57fa32b7e89972d5185071355ccf3739e4970ec3fedc25d60a96bc885c09f
+MISC ChangeLog 24764 RMD160 66c1b517aa4643c0f5782aa9a8bb932f89a43756 SHA1 555b433689353a0c57f5bad156fef64d66e1e957 SHA256 a34fe314f02393fe094ae6bd4e23c188f753836dc28c5e651533f806a229ad30
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksJeRUACgkQlPl3HsVfCDoqjgCfQtk9kOpwbN5+er/ebozAuStO
-S3cAnjHsrG4WiU3eQzEHcwXvrXZB3Lk9
-=4d4K
+iEYEARECAAYFAksQR0wACgkQlPl3HsVfCDom5QCfUC8AbGjDxhovquc8Pxrj3K1C
+W0cAn1G6z8xF+AEV6QnY8y5v2WSE2+O2
+=g9CC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-2.6.29.1-r2.ebuild b/sys-apps/iproute2/iproute2-2.6.29.1-r2.ebuild
new file mode 100644
index 000000000000..184026652a53
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.29.1-r2.ebuild
@@ -0,0 +1,106 @@
+# 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-r2.ebuild,v 1.1 2009/11/27 21:36:02 vapier Exp $
+
+EAPI="2"
+
+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
+	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://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}
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+	>=virtual/os-headers-2.6.27"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	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
+	epatch "${FILESDIR}"/${PN}-2.6.29.1-flush.patch #274973
+
+	epatch_user
+
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
+	# Multilib fixes
+	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
+		netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} || die
+	sed -i "s:/lib/tc:$(get_libdir)/tc:g" tc/Makefile || die
+}
+
+src_configure() {
+	echo -n 'TC_CONFIG_ATM:=' > Config
+	use atm \
+		&& echo 'y' >> Config \
+		|| echo 'n' >> Config
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+
+	# Use correct iptables dir, #144265 #293709
+	append-cppflags -DIPT_LIB_DIR=\\\"`$(tc-getPKG_CONFIG) xtables --variable=xtlibdir`\\\"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		|| die "make failed"
+}
+
+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
+}