From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 7 Aug 2006 02:48:40 +0000 (+0000)
Subject: simpler .config fix from Jac Goudsmit
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=adc6d3ef7783750e642850aa55340154f295812e;p=gentoo.git

simpler .config fix from Jac Goudsmit
Package-Manager: portage-2.1.1_pre4
---

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index f745b6f3f327..ce95e3fe714a 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -32,18 +32,18 @@ SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/co
 DIST busybox-1.1.3.tar.bz2 1435820 RMD160 b1e3409bc3180532af60140cdc5cfa84591c9641 SHA1 9feb01c74e370e7e59b6ccecd9cee2760435b462 SHA256 5228a88866211810c69d7a5be925cf87df47519b1d9d403aaca63bbdd32c975e
 DIST busybox-1.2.0.tar.bz2 1399041 RMD160 c9cc9cf3ad3f947519489c8492a845228a736438 SHA1 857ec4bec588af8f1f843472f02d2058a215f4bb SHA256 e066e6f526fd1a4473f4431a05848181d12056bd1c12456954a68f9b15a57624
 DIST busybox-1.2.1.tar.bz2 1404986 RMD160 c9eb1637856a98278a4666f1c27db861477c31ca SHA1 487ef51209e253d3aa981dc0b0645063a804f4c7 SHA256 c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410
-EBUILD busybox-1.1.3.ebuild 6695 RMD160 f46ade90e57b7c674ff39ef5c2f1983e4cf9d65e SHA1 c6cb96ca9892db6e6384f3bce7c16459d8121289 SHA256 ba9d36d40cb3e15faadc66d4ef2d407c1a1d4016ee71f41f652e4f14f996d9ca
-MD5 093b4d8dcb3850190ac233867be2a3ae busybox-1.1.3.ebuild 6695
-RMD160 f46ade90e57b7c674ff39ef5c2f1983e4cf9d65e busybox-1.1.3.ebuild 6695
-SHA256 ba9d36d40cb3e15faadc66d4ef2d407c1a1d4016ee71f41f652e4f14f996d9ca busybox-1.1.3.ebuild 6695
-EBUILD busybox-1.2.0.ebuild 6707 RMD160 da3e865549c2ed793a5f3240d18911faa6193e29 SHA1 7eca3b79ce1061531a82489a5a8a0a8c44929f85 SHA256 72c3af794a63f05cb04ad3dfb3e12bdb74b68137800eecaa813b1e125529a3f0
-MD5 e133eebc04e3bee86c50250d25d2ba07 busybox-1.2.0.ebuild 6707
-RMD160 da3e865549c2ed793a5f3240d18911faa6193e29 busybox-1.2.0.ebuild 6707
-SHA256 72c3af794a63f05cb04ad3dfb3e12bdb74b68137800eecaa813b1e125529a3f0 busybox-1.2.0.ebuild 6707
-EBUILD busybox-1.2.1.ebuild 6707 RMD160 bac8dc9293cf566366db69ce520b2e758bfd1ea2 SHA1 d158c1be07c4305708d86f7c535f5dc466a2bc4e SHA256 b38102238290d0508be670dd307d56f56bafa3e013707f15ec36de5affdf7d62
-MD5 c4b01949dcf650ceb609ccdb932eca18 busybox-1.2.1.ebuild 6707
-RMD160 bac8dc9293cf566366db69ce520b2e758bfd1ea2 busybox-1.2.1.ebuild 6707
-SHA256 b38102238290d0508be670dd307d56f56bafa3e013707f15ec36de5affdf7d62 busybox-1.2.1.ebuild 6707
+EBUILD busybox-1.1.3.ebuild 6614 RMD160 239d1af3245ff377d7e30587792e502b3ae99dbd SHA1 3e9232d071f11fd4a1c5ce5fcb07c4929990a64a SHA256 14a7f96f88798fcd24df7a7e0b7cf2d0894773e9008f62cda0f95fda2650cd6b
+MD5 5b99ae41c1d056327daf41af8c43ade0 busybox-1.1.3.ebuild 6614
+RMD160 239d1af3245ff377d7e30587792e502b3ae99dbd busybox-1.1.3.ebuild 6614
+SHA256 14a7f96f88798fcd24df7a7e0b7cf2d0894773e9008f62cda0f95fda2650cd6b busybox-1.1.3.ebuild 6614
+EBUILD busybox-1.2.0.ebuild 6626 RMD160 4a584191eebfbe1a6ac8dc66573007174b3c28f5 SHA1 c4b5f73261a62ad1068aad25ab12431bd2fc0ab1 SHA256 4986453edbf5ec9771ee04693a173a2197fe1e927951f11741abfff75c4c36d7
+MD5 81b7899cc74fbfaca7b1c48c716f5f94 busybox-1.2.0.ebuild 6626
+RMD160 4a584191eebfbe1a6ac8dc66573007174b3c28f5 busybox-1.2.0.ebuild 6626
+SHA256 4986453edbf5ec9771ee04693a173a2197fe1e927951f11741abfff75c4c36d7 busybox-1.2.0.ebuild 6626
+EBUILD busybox-1.2.1.ebuild 6626 RMD160 a6c4f92de77308bdb817de2b52f7742ac2e88270 SHA1 1128a3e11eb4ba39862c7c86cf14c1360f5a623c SHA256 2812ab341853918ca5c710f1a67e64b5e0afe0bb8ab31ae75797439f86d01786
+MD5 cec45449091d45455746f1704573950b busybox-1.2.1.ebuild 6626
+RMD160 a6c4f92de77308bdb817de2b52f7742ac2e88270 busybox-1.2.1.ebuild 6626
+SHA256 2812ab341853918ca5c710f1a67e64b5e0afe0bb8ab31ae75797439f86d01786 busybox-1.2.1.ebuild 6626
 MISC ChangeLog 17032 RMD160 c93e5e41847c3463b789baa82ba2e04ad6b94926 SHA1 da28d9ab6d7a5b0f5634201e8fbc18b0ae0eb46c SHA256 f4ff54fc75d8294b475ae9b59794aee3503d5eb799c1ed34a2902ea6794e175c
 MD5 3f61a61b97252915cc78e93d615c78e6 ChangeLog 17032
 RMD160 c93e5e41847c3463b789baa82ba2e04ad6b94926 ChangeLog 17032
@@ -64,7 +64,7 @@ SHA256 7cdd7cafb10a98988a5e4226f3b23246f785e3e624880789676f89fa362eb38b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE1qlzamhnQswr0vIRAkr2AJ9Mp3/O/oe2QE6x0USJxGNKNUcd6wCgledW
-//qQ5xZqtXL9rU4LIV474sA=
-=IWux
+iD8DBQFE1qoYamhnQswr0vIRAgCVAKCTSDm6fZyAjpXUt1j8FZOWtjd4GQCdG/2/
+NpWsZxAHKSpW1vZr+PWnuuc=
+=5DUR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.3.ebuild b/sys-apps/busybox/busybox-1.1.3.ebuild
index f3eec6282a01..ce3ce033a874 100644
--- a/sys-apps/busybox/busybox-1.1.3.ebuild
+++ b/sys-apps/busybox/busybox-1.1.3.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.3.ebuild,v 1.14 2006/08/07 02:45:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.3.ebuild,v 1.15 2006/08/07 02:48:40 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -73,19 +73,14 @@ src_unpack() {
 			for root in "${ROOT}" / ; do
 				configfile=${root}etc/portage/savedconfig/${conf}.config
 				if [[ -r ${configfile} ]] ; then
+					einfo "Found your ${configfile} and using it."
 					cp ${configfile} "${S}"/.config
-					break
+					yes "" | make oldconfig > /dev/null
+					return 0
 				fi
 			done
-			[[ -e .config ]] && break
 		done
-		if [[ -r ${S}/.config ]] ; then
-			einfo "Found your ${configfile} and using it."
-			yes "" | make oldconfig > /dev/null
-			return 0
-		else
-			die "Could not locate user configfile, please fix"
-		fi
+		die "Could not locate user configfile, please fix"
 	fi
 	if use netboot ; then
 		cp "${FILESDIR}"/config-netboot .config
diff --git a/sys-apps/busybox/busybox-1.2.0.ebuild b/sys-apps/busybox/busybox-1.2.0.ebuild
index 40a6248c12cc..ba14b9f18f74 100644
--- a/sys-apps/busybox/busybox-1.2.0.ebuild
+++ b/sys-apps/busybox/busybox-1.2.0.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.2.0.ebuild,v 1.6 2006/08/07 02:45:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.0.ebuild,v 1.7 2006/08/07 02:48:40 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -73,19 +73,14 @@ src_unpack() {
 			for root in "${ROOT}" / ; do
 				configfile=${root}etc/portage/savedconfig/${conf}.config
 				if [[ -r ${configfile} ]] ; then
+					einfo "Found your ${configfile} and using it."
 					cp ${configfile} "${S}"/.config
-					break
+					yes "" | make oldconfig > /dev/null
+					return 0
 				fi
 			done
-			[[ -e .config ]] && break
 		done
-		if [[ -r ${S}/.config ]] ; then
-			einfo "Found your ${configfile} and using it."
-			yes "" | make oldconfig > /dev/null
-			return 0
-		else
-			die "Could not locate user configfile, please fix"
-		fi
+		die "Could not locate user configfile, please fix"
 	fi
 	if use netboot ; then
 		cp "${FILESDIR}"/config-netboot .config
diff --git a/sys-apps/busybox/busybox-1.2.1.ebuild b/sys-apps/busybox/busybox-1.2.1.ebuild
index 1a4621a364a4..8ad437aead88 100644
--- a/sys-apps/busybox/busybox-1.2.1.ebuild
+++ b/sys-apps/busybox/busybox-1.2.1.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.2.1.ebuild,v 1.2 2006/08/07 02:45:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.1.ebuild,v 1.3 2006/08/07 02:48:40 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -73,19 +73,14 @@ src_unpack() {
 			for root in "${ROOT}" / ; do
 				configfile=${root}etc/portage/savedconfig/${conf}.config
 				if [[ -r ${configfile} ]] ; then
+					einfo "Found your ${configfile} and using it."
 					cp ${configfile} "${S}"/.config
-					break
+					yes "" | make oldconfig > /dev/null
+					return 0
 				fi
 			done
-			[[ -e .config ]] && break
 		done
-		if [[ -r ${S}/.config ]] ; then
-			einfo "Found your ${configfile} and using it."
-			yes "" | make oldconfig > /dev/null
-			return 0
-		else
-			die "Could not locate user configfile, please fix"
-		fi
+		die "Could not locate user configfile, please fix"
 	fi
 	if use netboot ; then
 		cp "${FILESDIR}"/config-netboot .config