make sure old config files dont hang the build process #131210 by DominikBuerkle

Package-Manager: portage-2.1_pre9-r4

4 files changed, 34 insertions, 21 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index ea69bf94c511..7e2e4dcfc9e7 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.00/bash-tests.patch 1474 RMD160 01c16591ff5d5b339a605a4372c6e431270862ed SHA1 c64e6aa9f816d7e7915d99f7737dad2250c27637 SHA256 091f9aa2a5294cf9659ffaa2c6f995e9af2d0cdc2388ecab3620d06fd4ac4cb2 size 1474
 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
 RMD160 01c16591ff5d5b339a605a4372c6e431270862ed files/1.00/bash-tests.patch 1474
@@ -70,9 +73,9 @@ AUX config-netboot 9853 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 SHA1 0dc
 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853
 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853
-DIST busybox-1.00-e2fsprogs.patch.bz2 16713 size 16713
-DIST busybox-1.00.tar.bz2 1118427 size 1118427
-DIST busybox-1.01.tar.bz2 954613 size 954613
+DIST busybox-1.00-e2fsprogs.patch.bz2 16713 RMD160 7c70d03f902f916fff02cf4ce126ba19db65ea56 SHA256 15fa252f80c08e7d9a82d78f5b7d2118c6ffbe233ae732d3289f7ac3830612b6 size 16713
+DIST busybox-1.00.tar.bz2 1118427 RMD160 357a65c86ca9188a381c69e9c8ded8a3c80a2f50 SHA256 aefbd1abb592a3234298ab80ba58567fc46fa63348b054de3471ec9a717291a0 size 1118427
+DIST busybox-1.01.tar.bz2 954613 RMD160 dfd9027208161977a8bcc920c7656fbf1b305446 SHA256 3e2ceb893d6267e6ed230826b2e5990cb20999b349621a1a6ae9f927fdb85499 size 954613
 DIST busybox-1.1.0.tar.bz2 1408642 RMD160 12769c88b1813063044ff29d43171be114cf178d SHA256 3377d271dcfcbf8f49368c63c4819d4f8306bc529766bb0d8f4a12888fb20596 size 1408642
 DIST busybox-1.1.1.tar.bz2 1424767 RMD160 f95b4f0756a7391922ee477635719a7bfbac78e9 SHA256 1334d7631305eb700f03006f9b3f2cf1031d774f2ff584325531186e33e9852a size 1424767
 DIST busybox-1.1.2.tar.bz2 1427310 RMD160 106dfce4d83438a77ef87799fdddc3d246f570ff SHA256 068cd2b46273d722b178314c8eab755d771d52bb5f82c6db34dbeca0e56db350 size 1427310
@@ -92,10 +95,10 @@ EBUILD busybox-1.1.1.ebuild 6517 RMD160 2a133a555211be473d6744a4ed5a7138ba908059
 MD5 d579121e0cf97ec9608ef21f3dbc1a77 busybox-1.1.1.ebuild 6517
 RMD160 2a133a555211be473d6744a4ed5a7138ba908059 busybox-1.1.1.ebuild 6517
 SHA256 7f81d8354b5114bdf45496931ab007b655a2a68604126046cc1c6d8b76b5d265 busybox-1.1.1.ebuild 6517
-EBUILD busybox-1.1.2.ebuild 6476 RMD160 020f9aab77056a68b0c0b28463e6af0f21f2e1bf SHA1 8dd442c8612713f68ec90debcf29bc7f38630344 SHA256 39b2e9a7ea85484475f34b7a3ba83bf0c1b78bb2027bf823dca4e4afc038d1e0 size 6476
-MD5 88181e875fca811dcf61d3f0ed9964b9 busybox-1.1.2.ebuild 6476
-RMD160 020f9aab77056a68b0c0b28463e6af0f21f2e1bf busybox-1.1.2.ebuild 6476
-SHA256 39b2e9a7ea85484475f34b7a3ba83bf0c1b78bb2027bf823dca4e4afc038d1e0 busybox-1.1.2.ebuild 6476
+EBUILD busybox-1.1.2.ebuild 6485 RMD160 51a4e15e53d01ba7a5d9f0df8789e9df044e5e66 SHA1 8ad70613e81a110d81db2956e455ebfb34f9f0da SHA256 6375cafbe661f0ccf1584471f29f8008c872b98e3b6003ada29ebcf89bf1fe9c size 6485
+MD5 8dca07db51f4ee188e443e555f174c04 busybox-1.1.2.ebuild 6485
+RMD160 51a4e15e53d01ba7a5d9f0df8789e9df044e5e66 busybox-1.1.2.ebuild 6485
+SHA256 6375cafbe661f0ccf1584471f29f8008c872b98e3b6003ada29ebcf89bf1fe9c busybox-1.1.2.ebuild 6485
 MISC ChangeLog 15493 RMD160 9f8d0bcc72082ab7a05a9c096f38e99adcc98246 SHA1 4a9be40cc51f30b4972a82e6009ba73c858499f5 SHA256 24a0095e31a05b62adda79e8813410f6c16b3b170cc2f92ad947a0036d228afa size 15493
 MD5 64f0750b2c6b729c98f9d6763d1cbb00 ChangeLog 15493
 RMD160 9f8d0bcc72082ab7a05a9c096f38e99adcc98246 ChangeLog 15493
@@ -104,23 +107,25 @@ MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
 SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata.xml 161
-MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142
-RMD160 ab359264555cd808eef30f09f5b82070043fc096 files/digest-busybox-1.00-r4 142
-SHA256 50b70755826d2949f40cbf2e650d37759b2179f0d6ba3389cd5dfa614d577fed files/digest-busybox-1.00-r4 142
-size 142 files/digest-busybox-1.00-r4 142
-MD5 adbc93ab59ec8e00c78e1807b35a0c6c files/digest-busybox-1.01 141
-RMD160 06e7f1b13073f8bffd958ed67535eb298651f7ff files/digest-busybox-1.01 141
-SHA256 38219f6679549d0e6b888b2a91b97fc466107e7410c50fbbc3cb1461a4e537d0 files/digest-busybox-1.01 141
-size 141 files/digest-busybox-1.01 141
+MD5 e1a06ceb674be43e1479a7a739f12f5f files/digest-busybox-1.00-r4 518
+RMD160 72bb7818bfced5bc441716750acc7d2037977123 files/digest-busybox-1.00-r4 518
+SHA256 074e978023d755b93d15d4aed00f3ff0cff0284b9ca0f864eb951d729e4fe421 files/digest-busybox-1.00-r4 518
+MD5 2209d4f9aeb795666ea6738867fcd4d9 files/digest-busybox-1.01 515
+RMD160 11973e3df638d437af7bb32dbb3f8cc2e46d2286 files/digest-busybox-1.01 515
+SHA256 353d718ee84819d618f0c8f0794e21faa5979612f66bf808a41c03471d06f895 files/digest-busybox-1.01 515
 MD5 f6c0e8bba77ce0a1ed09e590071c033c files/digest-busybox-1.1.0 247
 RMD160 960eafa3aed947d819a4f5e56935c5942f3b6999 files/digest-busybox-1.1.0 247
 SHA256 282946af248671965c9462ace860bf663937b5a784aa894585e0c36e56f8b6c8 files/digest-busybox-1.1.0 247
-size 247 files/digest-busybox-1.1.0 247
 MD5 254257cdc3e7a26e8f27dbd5182000fa files/digest-busybox-1.1.1 247
 RMD160 2d0a53fdcd784bec8dac774f14db5c0d3aad90ea files/digest-busybox-1.1.1 247
 SHA256 3cc230fe38ccbbefa6e64bcf6a9509a2847c54e553009a655e2d546926a3ae5d files/digest-busybox-1.1.1 247
-size 247 files/digest-busybox-1.1.1 247
 MD5 66c1d874e3f70a9e6071cee23a018bb0 files/digest-busybox-1.1.2 247
 RMD160 db6809031599339e21f507f811473d6534f73f44 files/digest-busybox-1.1.2 247
 SHA256 ffca95b22009a84def1fd9b5ee69914fea28d7e50fe9b17d4afa83e140672ad2 files/digest-busybox-1.1.2 247
-size 247 files/digest-busybox-1.1.2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFETwIR2+ySkm8kpY0RAra+AJ9NOorrAeV04S1HKH19aYeBuSnrzgCeNjr9
+6lY4wKyZC3JAUZOwzJ9LnPc=
+=2xaq
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.2.ebuild b/sys-apps/busybox/busybox-1.1.2.ebuild
index de4a5d62c4b3..73925eb0593a 100644
--- a/sys-apps/busybox/busybox-1.1.2.ebuild
+++ b/sys-apps/busybox/busybox-1.1.2.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/busybox/busybox-1.1.2.ebuild,v 1.1 2006/04/10 22:31:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.2.ebuild,v 1.2 2006/04/26 05:15:30 vapier Exp $
 
 inherit eutils
 
@@ -78,7 +78,7 @@ src_unpack() {
 		done
 		if [[ -r ${S}/.config ]] ; then
 			einfo "Found your ${configfile} and using it."
-			make oldconfig > /dev/null
+			yes "" | make oldconfig > /dev/null
 			return 0
 		fi
 	fi
diff --git a/sys-apps/busybox/files/digest-busybox-1.00-r4 b/sys-apps/busybox/files/digest-busybox-1.00-r4
index e85997c1b6b6..de383caef616 100644
--- a/sys-apps/busybox/files/digest-busybox-1.00-r4
+++ b/sys-apps/busybox/files/digest-busybox-1.00-r4
@@ -1,2 +1,6 @@
-MD5 5c7ea9b5d3b3677dfcdcec38b281a756 busybox-1.00.tar.bz2 1118427
 MD5 af5bc43f345f102fc257787d7beacaac busybox-1.00-e2fsprogs.patch.bz2 16713
+RMD160 7c70d03f902f916fff02cf4ce126ba19db65ea56 busybox-1.00-e2fsprogs.patch.bz2 16713
+SHA256 15fa252f80c08e7d9a82d78f5b7d2118c6ffbe233ae732d3289f7ac3830612b6 busybox-1.00-e2fsprogs.patch.bz2 16713
+MD5 5c7ea9b5d3b3677dfcdcec38b281a756 busybox-1.00.tar.bz2 1118427
+RMD160 357a65c86ca9188a381c69e9c8ded8a3c80a2f50 busybox-1.00.tar.bz2 1118427
+SHA256 aefbd1abb592a3234298ab80ba58567fc46fa63348b054de3471ec9a717291a0 busybox-1.00.tar.bz2 1118427
diff --git a/sys-apps/busybox/files/digest-busybox-1.01 b/sys-apps/busybox/files/digest-busybox-1.01
index aa053eeb7c9a..cec09d6958c9 100644
--- a/sys-apps/busybox/files/digest-busybox-1.01
+++ b/sys-apps/busybox/files/digest-busybox-1.01
@@ -1,2 +1,6 @@
 MD5 af5bc43f345f102fc257787d7beacaac busybox-1.00-e2fsprogs.patch.bz2 16713
+RMD160 7c70d03f902f916fff02cf4ce126ba19db65ea56 busybox-1.00-e2fsprogs.patch.bz2 16713
+SHA256 15fa252f80c08e7d9a82d78f5b7d2118c6ffbe233ae732d3289f7ac3830612b6 busybox-1.00-e2fsprogs.patch.bz2 16713
 MD5 f250842dae2854a38470ed16a46bba66 busybox-1.01.tar.bz2 954613
+RMD160 dfd9027208161977a8bcc920c7656fbf1b305446 busybox-1.01.tar.bz2 954613
+SHA256 3e2ceb893d6267e6ed230826b2e5990cb20999b349621a1a6ae9f927fdb85499 busybox-1.01.tar.bz2 954613