Fix building with USE=-ipv6 #424928 by Dustin Polke.

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

4 files changed, 28 insertions, 12 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 5ab0d5919ae7..ee6a284e9ccf 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.319 2012/07/08 17:27:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.320 2012/07/18 11:29:35 vapier Exp $
+
+  18 Jul 2012; Mike Frysinger <vapier@gentoo.org> busybox-1.20.1.ebuild,
+  busybox-1.20.2.ebuild:
+  Fix building with USE=-ipv6 #424928 by Dustin Polke.
 
   08 Jul 2012; Raúl Porcel <armin76@gentoo.org> busybox-1.20.1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #419689
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 62595b6146f9..5835f752db64 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -21,19 +21,29 @@ AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9c
 AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
 DIST busybox-1.19.3.tar.bz2 2167188 SHA256 a1a9a35732c719ef384f02b6e357c324d8be25bc154af91a48c4264b1e6038f0 SHA512 a7072c45ad395d0cd4e84427e06b35bfae93e695a0f7edc39087ff8f9cb08c53550c74446839617db4dd177530a04b2aaabf188732193a2d73eed737debf3bd3 WHIRLPOOL d436a6bd329c99a9e01e2a0dfdb1577067dd4e4288ed3de72e2d94bc6923d3a0eb4dc53f726520222285137672b0d5337c334acd4afe5e4c665cde9d1422e53c
 DIST busybox-1.20.0.tar.bz2 2190652 SHA256 3c56508d984db1178664241ad548d118fb0aa71cdd2f8a9a93038e50b3b2bf16
-DIST busybox-1.20.1.tar.bz2 2190170 SHA256 3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9
-DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882
+DIST busybox-1.20.1.tar.bz2 2190170 SHA256 3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9 SHA512 9ad2af7216ae79c2c8cf246654a2c591983d347d22bfe4cd54ae41eaee0ea17f7bf8d6834add3f1f843494d6980707e0443aaf663075fda6e4e7e29728606c53 WHIRLPOOL 07ce28698c63a38ce2c6d71bfbfe1f920f07a76d471db9b9b1a7260ef1bf493551bae67d9b9dc2be41783f1ce0cf56935c44eb7af2a1bc865807afaa87eaabec
+DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420
 EBUILD busybox-1.19.3-r1.ebuild 8449 SHA256 89497a117be3235619155c56984ada796850517d2e2583e4aefeebd02780822b SHA512 738cf1d3887471707815f8b3e22b5864ef16cfa1244f8b30cf7ccf5aa70a291484acacc3aa89cdca8be3cbbadb01fb767dd9f1a74566ebb30cdd15e30aee7935 WHIRLPOOL cfb0d1553813c7780589ba281b4a8216009adcec450843d4c2ab8e4fc39c2c5e0bac36f13743528c03ecc8c74503521b39e3a4e7db39bc1d37abe4fcf2526673
 EBUILD busybox-1.20.0.ebuild 8811 SHA256 19c606393839c21452f4352d6290495a27edddfc7b1d7fabff373da2d06a3dee SHA512 20c085027cea9ab62564f63eaf26f0ac205804ba2be6da02609dcd77c4adfa6dc6c08b56d7cb747d34938a3440bb27522a11515f50d71215f4bdca8d4c5ed04f WHIRLPOOL 822bf4e851f642d20a1786b53ca80cbeef86d2bee6d8775f395d87c254b66da991f1964c5f62e61f36d150566f0582e9c465e47285ad6315feb188435e6b5608
-EBUILD busybox-1.20.1.ebuild 8801 SHA256 cfc7a32fa9b1e998330b818e226b876cc353f3f0162cacb65eed38d3ce0225a3 SHA512 fc054441f330bae9f47b9eb7720876b73ea4f400721b590244976fa9e2e51e7548376acc68cc47ae4139b32cf643999f0b9bd922cf95c4bb8ca0b623dfb0fad8 WHIRLPOOL 20f6c40a6d409a027f431978309974297be2e9bec91a174096bdd46ecc8597ee1335a318f3227b22166dba11cd14695a0c4141258f5bf4cca6c6de839fba4079
-EBUILD busybox-1.20.2.ebuild 8811 SHA256 0670ef2e38c8a18615987517d510ed4d3cbef97bc340b2b55fa51f3dc3b566c9 SHA512 a09868fd956a0fe392d579dc179000bd1beb80e6d514f57d45404ee6cce6939bf3ee7ecac133bd2c7b7d93f9687ec9fe24601828e09c210d9c4a30fc9d719e72 WHIRLPOOL 5ca0d29486ef285a9b8b21a033615985668c0ab3d0fb0e0c1191f9873fb5986a4ee9d68b510d8dd507bfa10f08c264a85ed48b7676873f8126a9f236df262bca
+EBUILD busybox-1.20.1.ebuild 8854 SHA256 6df4da6cff549e49babb76991fc9b0972b32a61e88906fc550a99e719dc861ed SHA512 72c291f76da4a018ee9b9a2a95150998afb2a5f26ad8125ac3b6e7f88c8a1aa7baf34908329aee6be7f8035041d42608d635efdbc7ec64dec901cc4b1ba7c41c WHIRLPOOL a63a743b92b9d4affa544dbe71005c0497bcf673a600c00b905043b6534dfed830cc225624e5f4c4b8166a3a7bc68f8b8ced1a90819f16943d0816278a63761b
+EBUILD busybox-1.20.2.ebuild 8865 SHA256 99ee7d8471c00ff27e36c04cc7b11aa8e32cb675f011d0577f7e17c7111f0c52 SHA512 d1b32e3074b2d5c56ce5e63d8586383fce37cab0acd0b7f0ddc6fdd43cefe5da7a98863026d16d9a6c80e09305ba9afc84149f57d0b26cce46dae3348fc47bd5 WHIRLPOOL 598220ef4a1d6cbbd78d68ab15611d0ac70b5514258a817c6173051283cfcee6e07186da1c28127ba6126692df2ea779236d9175b51d20bd0be5c03019e5fe4a
 EBUILD busybox-9999.ebuild 8809 SHA256 e2e1f552555d23b33d4aa6c498a6dc63ba6d2c3eeedbff2f9c278e36adce00c9 SHA512 ca06521a41cb782cda0ca9173ccc9e32c150a47ab4aabbefdc952defe6ed0e4be77086bdf2ea581c6c7d29fca4f1d8582663d926c0a1b85d84cd38ad5ca11831 WHIRLPOOL b62928e1c0e796ac1b8cd25153134ba6365815f0bea5f75103abbad139661b9e15774ada4d8c184f15d82aee97a1de82f32138f1d8de43b5352f136ddd878b69
-MISC ChangeLog 49150 SHA256 b26d601f350d4566842f2abec5484ad2769b041f4b3727be3648c055ab5e917a SHA512 6fc3d026ee6c8bd8089513afa71ddc5d269ba20b3f943bede5b07c04f367651ad27cb931ac640c8c342b6199d09a1b6ae75da08d9d00cbd945d1f3c7e8e0ccc9 WHIRLPOOL 056c3a22cf6d1b216a947bb093392d12585ecc769195d09b49e1a9c5faeaa576ae23cff17ef50e38966ff2d8fd3fe4881cdda8c1348062438701a6cbcf9f4c18
+MISC ChangeLog 49303 SHA256 834eaf69194944b72801bdd1abc9e28858b5d1b0041bafaa319a58a87f4082d2 SHA512 c7a5b0b86f58c208547e19be3f90abd9fd205ee3433594d45307db30d1af9a4ec5f9f8ab852e1beaf2bffd60db3833adc0a6f809658fb73389ec774a99ad6f8b WHIRLPOOL 52382cfc28227ba0747dd749d408a5fec7a502699f434741de4e650f09574c372b518fa5aaebc90c324d29aa42914479ac7690dcd846f124516097a863d432d0
 MISC metadata.xml 546 SHA256 8464a2acbbf52780d1c71a1f6b06cc1dc00b6d027b6b04ca91ab25a7d7ce5e0b SHA512 defb209c00b234996da54b044a3127f7a27b5e19bffcbe9214a4a2e79ae72a397e0baf4032300d2fd57569075ee0dd2477cf9fd669df3733555706d8625d8d3f WHIRLPOOL 538ebfe7434fa3e86c02244ad8bd5c8419735eaad54daeb928f9957d171243fa3453f47b85503ea1cff44fdb92e95af5ac08a34802a8dbed07fe367c956438e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/5wx0ACgkQuQc30/atMkCvzwCcCGmOPs+cctMJT/EouGxkmfKM
-T58AoLbUnA8CBjg/Y6qwgHIm3NilC4NN
-=znWj
+iQIcBAEBAgAGBQJQBp45AAoJELEHsLL7fEFWzdoP/j+rVocQdr2b3/TzBsKKSVkC
+2ml6gPHgCV0t8S+VYQ9M8kqVh1RqreL5+Tf1pK7IhTzqgiC9J3XuU6wjRaODr6Mg
+2MSzyAdCEWH+g+F1lN2cCsWnBoDAZBt/j+cigSVSr/e7uQ0l1R4vIrgw6n2hQ/wB
+8HPZYdnW4Nggrg28sLwhWZ8DVGTB5qO+o4qGIqzmcjDAlDpK4hDaX6OEaAFSYPA6
+2vUBAEYTdJ8abjaXHr3g69eLChPPyBrcNOZICo1LF+W7M2spLzkB37cJKAky3Dsk
+RBPtKLpt/U/g/ql99LIH6ET0+Rvq+hSoXgXlU8PxRXsIhzQ6j1QySZOSyR6PsXSh
+vg9A3lxV2l6V7/GHSaYIM642QY+iOSrW2tu0g4drDcDBS2SVcuY5gsU1DX71UWYB
+7nZ+xJUWEfIUj3NFiGeCro9lpJl7Mw4CxwIguWSoAyhXEpJkZLkty2hhlG4krzJ+
+l/XUrtAKOS3i56xnuzxG8vZuZiyZlsEAr8rHS5kFhG0n7dnC+QoQCZRSUtKsHkug
+r860B6w2e/N+5fIIGC8BsQGNCWjFNRqwIssLz4I0+TxpaF/RGta9tXII/nTSIVAK
++ZdflFutPBkvBOZTLpxrblyJbBC+G1WFZzpsMkK6n56gqjy8PHh+bB0okDY3erD7
+d+fxUpg2vQHSbLSYtkiJ
+=4j/j
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.20.1.ebuild b/sys-apps/busybox/busybox-1.20.1.ebuild
index 17f1ac3abef7..d8f6464faff6 100644
--- a/sys-apps/busybox/busybox-1.20.1.ebuild
+++ b/sys-apps/busybox/busybox-1.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.1.ebuild,v 1.8 2012/07/08 17:27:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.1.ebuild,v 1.9 2012/07/18 11:29:35 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
@@ -87,6 +87,7 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+	epatch "${FILESDIR}"/${PN}-1.20.0-udhcpc6-ipv6.patch
 	#epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild
index 5ec16a0790b0..1afa87eaf6ab 100644
--- a/sys-apps/busybox/busybox-1.20.2.ebuild
+++ b/sys-apps/busybox/busybox-1.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.1 2012/07/06 03:37:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.2 2012/07/18 11:29:35 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
@@ -87,6 +87,7 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+	epatch "${FILESDIR}"/${PN}-1.20.0-udhcpc6-ipv6.patch
 	epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die