fixup the iptables path as reported by Denys #133932

Package-Manager: portage-2.1

2 files changed, 19 insertions, 21 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 4af73dd209f1..33b91fcba967 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,48 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX iproute2-051007-esfq-2.6.13.patch 6499 RMD160 aee6f0cb90aae41664e8707a1b4874b5fb5ac2c6 SHA1 7f3689c01cbf885866266baedbc440e56b5679e9 SHA256 72a3aadd8e4825082e6e60d53ccb00a2b80930d49f7d51824e83435de5c0dfb0 size 6499
+AUX iproute2-051007-esfq-2.6.13.patch 6499 RMD160 aee6f0cb90aae41664e8707a1b4874b5fb5ac2c6 SHA1 7f3689c01cbf885866266baedbc440e56b5679e9 SHA256 72a3aadd8e4825082e6e60d53ccb00a2b80930d49f7d51824e83435de5c0dfb0
 MD5 9b29094618e58434d24db4cd77edb622 files/iproute2-051007-esfq-2.6.13.patch 6499
 RMD160 aee6f0cb90aae41664e8707a1b4874b5fb5ac2c6 files/iproute2-051007-esfq-2.6.13.patch 6499
 SHA256 72a3aadd8e4825082e6e60d53ccb00a2b80930d49f7d51824e83435de5c0dfb0 files/iproute2-051007-esfq-2.6.13.patch 6499
-AUX iproute2-2.6.11.20050330-wrr.patch 13574 RMD160 30b684bca7909c97f2bb23a4966228c10f942e1e SHA1 eef45cabfb9684503de6e879021a25700b5a1993 SHA256 67ddf275e6fab4e1b78541f617326b8182a0095b6fdbc96b6415751c4deeac7a size 13574
+AUX iproute2-2.6.11.20050330-wrr.patch 13574 RMD160 30b684bca7909c97f2bb23a4966228c10f942e1e SHA1 eef45cabfb9684503de6e879021a25700b5a1993 SHA256 67ddf275e6fab4e1b78541f617326b8182a0095b6fdbc96b6415751c4deeac7a
 MD5 f2f62bc9b7aa8ad751e47fa11a952976 files/iproute2-2.6.11.20050330-wrr.patch 13574
 RMD160 30b684bca7909c97f2bb23a4966228c10f942e1e files/iproute2-2.6.11.20050330-wrr.patch 13574
 SHA256 67ddf275e6fab4e1b78541f617326b8182a0095b6fdbc96b6415751c4deeac7a files/iproute2-2.6.11.20050330-wrr.patch 13574
-AUX iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578 RMD160 83b0f70fd1699010212f00b4c584e4d3d3e25d77 SHA1 8564667a1d66557d73a2395c27a4b608908483d5 SHA256 1cd4274318f51a5e989abdb0e339ba8ce53025e38de2af7c12f7023ee7bdcf49 size 578
+AUX iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578 RMD160 83b0f70fd1699010212f00b4c584e4d3d3e25d77 SHA1 8564667a1d66557d73a2395c27a4b608908483d5 SHA256 1cd4274318f51a5e989abdb0e339ba8ce53025e38de2af7c12f7023ee7bdcf49
 MD5 d69e0e70cafe6753a28679140550040a files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578
 RMD160 83b0f70fd1699010212f00b4c584e4d3d3e25d77 files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578
 SHA256 1cd4274318f51a5e989abdb0e339ba8ce53025e38de2af7c12f7023ee7bdcf49 files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578
-DIST iproute2-2.6.15-060110.tar.gz 394322 RMD160 6738587d26a95cb2563fa5d218c00bd3ed3e598f SHA256 9736c27e606b31af714e319bfad5bb9abdcbaf9b4f2ec496ca6310ff56b815d8 size 394322
-DIST iproute2-2.6.16-060323.tar.gz 386555 RMD160 fbc5999842a6a1a5b4ba792e93e25ed8df7c959b SHA256 e382a4c0de31a5196e0c7829d6f7e29d0263cf90a4def10302db694fc2f30da2 size 386555
-EBUILD iproute2-2.6.15.20060110.ebuild 1970 RMD160 531dfb2d7c667cbc0f1531b52c9b91d6ece185a4 SHA1 3c0488b315e0ddaef78d8f7a5596954dea555e8a SHA256 d1e9c6ea5d501a96b859d4c06ce6d8a5a8790343f1880eeb880c89dc68bf86bb size 1970
+DIST iproute2-2.6.15-060110.tar.gz 394322 RMD160 6738587d26a95cb2563fa5d218c00bd3ed3e598f SHA256 9736c27e606b31af714e319bfad5bb9abdcbaf9b4f2ec496ca6310ff56b815d8
+DIST iproute2-2.6.16-060323.tar.gz 386555 RMD160 fbc5999842a6a1a5b4ba792e93e25ed8df7c959b SHA256 e382a4c0de31a5196e0c7829d6f7e29d0263cf90a4def10302db694fc2f30da2
+EBUILD iproute2-2.6.15.20060110.ebuild 1970 RMD160 531dfb2d7c667cbc0f1531b52c9b91d6ece185a4 SHA1 3c0488b315e0ddaef78d8f7a5596954dea555e8a SHA256 d1e9c6ea5d501a96b859d4c06ce6d8a5a8790343f1880eeb880c89dc68bf86bb
 MD5 e98c7815174c6fc1aff14d1753ec2de6 iproute2-2.6.15.20060110.ebuild 1970
 RMD160 531dfb2d7c667cbc0f1531b52c9b91d6ece185a4 iproute2-2.6.15.20060110.ebuild 1970
 SHA256 d1e9c6ea5d501a96b859d4c06ce6d8a5a8790343f1880eeb880c89dc68bf86bb iproute2-2.6.15.20060110.ebuild 1970
-EBUILD iproute2-2.6.16.20060323.ebuild 2053 RMD160 698bf8989085b2efad528dffe7b37a2bd0208d7b SHA1 afa94ff3020c7a07a5d41f92dafe7320ff409608 SHA256 7fa7a46d5189ce5ae15ae08375f4d1c60c3aa201bcffe89a39f8c281248bf5d6 size 2053
-MD5 8b8c02d83f7315abc7e26fc509026a12 iproute2-2.6.16.20060323.ebuild 2053
-RMD160 698bf8989085b2efad528dffe7b37a2bd0208d7b iproute2-2.6.16.20060323.ebuild 2053
-SHA256 7fa7a46d5189ce5ae15ae08375f4d1c60c3aa201bcffe89a39f8c281248bf5d6 iproute2-2.6.16.20060323.ebuild 2053
-MISC ChangeLog 12685 RMD160 d62f8eddf4896a52358359a25588a4b2ce73babd SHA1 c7b525382d85c9325aa0aaac428be5933013353e SHA256 9e97f986d99017356f0a9e1bf14b17b292b466b8ca7a0c32fbc0a3efa65f6b7a size 12685
+EBUILD iproute2-2.6.16.20060323.ebuild 2091 RMD160 98b83f11c8a9fb7a7416a407a5395d6f8593a0ec SHA1 25a81ee3f87833868a8bb43c9368e98ebc7a4b01 SHA256 044da47c0621d8fcf26cda341a84fadbcdf9c9cb15135daae9ed3d249874a7f9
+MD5 71c354373c477271d0a66ec7db88ee65 iproute2-2.6.16.20060323.ebuild 2091
+RMD160 98b83f11c8a9fb7a7416a407a5395d6f8593a0ec iproute2-2.6.16.20060323.ebuild 2091
+SHA256 044da47c0621d8fcf26cda341a84fadbcdf9c9cb15135daae9ed3d249874a7f9 iproute2-2.6.16.20060323.ebuild 2091
+MISC ChangeLog 12685 RMD160 d62f8eddf4896a52358359a25588a4b2ce73babd SHA1 c7b525382d85c9325aa0aaac428be5933013353e SHA256 9e97f986d99017356f0a9e1bf14b17b292b466b8ca7a0c32fbc0a3efa65f6b7a
 MD5 4b6c1659877995bc3b09dc4ca0fb7f69 ChangeLog 12685
 RMD160 d62f8eddf4896a52358359a25588a4b2ce73babd ChangeLog 12685
 SHA256 9e97f986d99017356f0a9e1bf14b17b292b466b8ca7a0c32fbc0a3efa65f6b7a ChangeLog 12685
-MISC metadata.xml 225 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 SHA1 e384e99e2d9d8b4dd3ce54f8e857268cbe352c5e SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68 size 225
+MISC metadata.xml 225 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 SHA1 e384e99e2d9d8b4dd3ce54f8e857268cbe352c5e SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 metadata.xml 225
 SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68 metadata.xml 225
 MD5 45377eac0df99a87c60e5f81726c7d27 files/digest-iproute2-2.6.15.20060110 268
 RMD160 b66993cd208425f21ceb2255d15bfa8aee3218ca files/digest-iproute2-2.6.15.20060110 268
 SHA256 fb8ccc446bf4164b55e461c3fc26b87a38942088ae25912fe62938abab59036b files/digest-iproute2-2.6.15.20060110 268
-size 268 files/digest-iproute2-2.6.15.20060110 268
 MD5 c2bcd85e6af58ebf32f995225f8b766b files/digest-iproute2-2.6.16.20060323 268
 RMD160 14ad98d361d67d3027e98aeb1be8a7ec43e915d2 files/digest-iproute2-2.6.16.20060323 268
 SHA256 eeabcc17b891c84023aa1614021d5fe2d5e45d59cc3a0f04802c2a854ce20eaf files/digest-iproute2-2.6.16.20060323 268
-size 268 files/digest-iproute2-2.6.16.20060323 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFERtrP2+ySkm8kpY0RAo8CAKCYGfJxBIV/++sDz1s4KMQFdB00SACfWZyZ
-k52fv+tcoEi5PryjhoP25w4=
-=CsUr
+iD4DBQFEjC4d2+ySkm8kpY0RAr/iAJ4jxp/1zhTc64kVSc/94BdmqeKBAQCY+aWn
+nh8rwKG8MRIXLMvAZ3JONA==
+=41MY
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild b/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild
index 551c5d7cb38d..b54a082bf9d0 100644
--- a/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild,v 1.2 2006/04/19 00:32:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild,v 1.3 2006/06/11 14:47:54 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -37,9 +37,9 @@ src_unpack() {
 	# 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
+	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} || die
+		netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} include/iptables.h || die
 }
 
 src_compile() {