converted to saveconfig eclass version at Mike\'s request

Package-Manager: portage-2.1.2.7

3 files changed, 31 insertions, 65 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 753c890bea66..1cf14f713cfa 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.144 2007/06/11 04:14:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.145 2007/06/11 05:10:56 dragonheart Exp $
+
+  11 Jun 2007; Daniel Black <dragonheart@gentoo.org> busybox-1.6.0.ebuild:
+  converted to saveconfig eclass version at Mike\'s request
 
 *busybox-1.6.0 (11 Jun 2007)
 *busybox-1.5.1 (11 Jun 2007)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index b9f0d338efc7..85681933fc6d 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.0/bb.patch 866 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 SHA1 257b0dea76eb8656e2d0f03cc877af05415bcd0b SHA256 5e4ca94e7f5914d0e525bec1d661b978fd2e3d356cb1d1014701c6e486f4d7f8
 MD5 3d19b371b9686743428acdae5c3dd9e4 files/1.4.0/bb.patch 866
 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 files/1.4.0/bb.patch 866
@@ -58,14 +55,14 @@ EBUILD busybox-1.5.1.ebuild 7868 RMD160 3313fa7722592dab4286f437e13ffa3411e59b2a
 MD5 0c00cddb8c1185a2ea499d02ecaae4c2 busybox-1.5.1.ebuild 7868
 RMD160 3313fa7722592dab4286f437e13ffa3411e59b2a busybox-1.5.1.ebuild 7868
 SHA256 d0efd9c165bef570e533cf64b226352aea445353130898a84505e8ec95cb9dec busybox-1.5.1.ebuild 7868
-EBUILD busybox-1.6.0.ebuild 7932 RMD160 49f4875d7b869298ea3aad64086623d667ceb622 SHA1 e659f2cc330e5b99b196d9107cdb22312322882a SHA256 3b1e230066131a3037d4e9119ff351b8d02d2aac860c6a815d27a8c13865fc99
-MD5 2a63e969dab99ced5a3f350ad6b9a853 busybox-1.6.0.ebuild 7932
-RMD160 49f4875d7b869298ea3aad64086623d667ceb622 busybox-1.6.0.ebuild 7932
-SHA256 3b1e230066131a3037d4e9119ff351b8d02d2aac860c6a815d27a8c13865fc99 busybox-1.6.0.ebuild 7932
-MISC ChangeLog 22569 RMD160 55815eec4e8682abeaa1f5896ec5a46e63008a0c SHA1 def4afba1638f4bcbba7d279a3b8e58d1f312eb0 SHA256 0687dc038123640363d2e767fac5d8459d1fe7742552dc3ff82568e28624a603
-MD5 028c7fa964c5c18b405f58ac685c6094 ChangeLog 22569
-RMD160 55815eec4e8682abeaa1f5896ec5a46e63008a0c ChangeLog 22569
-SHA256 0687dc038123640363d2e767fac5d8459d1fe7742552dc3ff82568e28624a603 ChangeLog 22569
+EBUILD busybox-1.6.0.ebuild 6755 RMD160 a614f828d25cb439aa334df78980227411c52092 SHA1 6b12fef95316e7cdd4298825a6d13b2a19169273 SHA256 37a1efaed573df8fad37abffc42fc66d6b68b0ff87e3dc854b7317c6521d4f6f
+MD5 cb8e9b2f28266c2bb2b7f50f2c3dd5fa busybox-1.6.0.ebuild 6755
+RMD160 a614f828d25cb439aa334df78980227411c52092 busybox-1.6.0.ebuild 6755
+SHA256 37a1efaed573df8fad37abffc42fc66d6b68b0ff87e3dc854b7317c6521d4f6f busybox-1.6.0.ebuild 6755
+MISC ChangeLog 22710 RMD160 94157e900e6aaa0f65cb27aaf149ca6be05eb5ee SHA1 836fee5e65ad57ce53d1bebb5184db7823a250be SHA256 953f6e81ad720c0aea568ef2c21cbb811c684742735c526a84c73045d555bf39
+MD5 8da75d757bb16d410feca10117a75a99 ChangeLog 22710
+RMD160 94157e900e6aaa0f65cb27aaf149ca6be05eb5ee ChangeLog 22710
+SHA256 953f6e81ad720c0aea568ef2c21cbb811c684742735c526a84c73045d555bf39 ChangeLog 22710
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -85,10 +82,3 @@ SHA256 0c4738d4288bcae2dd248d07644cecfb9feee69ba5a74fb887a26cec883d0ea5 files/di
 MD5 a46a90f2be2e9e479196132f98e1a808 files/digest-busybox-1.6.0 247
 RMD160 cd8161329dddc28cd1af96b0bf1e3f9a8b81d07d files/digest-busybox-1.6.0 247
 SHA256 229c61c237b33f6b56e83a57fe63ef286c72c5a1417dfce1f6868a636c19e12b files/digest-busybox-1.6.0 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGbMxC8bi6rjpTunYRAljEAKCaFFuoB/h0fxZtK/CKpzLvWc1TUgCfR+4M
-a61uRAPOg20kAGhCj9CJ4tY=
-=MKri
------END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.6.0.ebuild b/sys-apps/busybox/busybox-1.6.0.ebuild
index e5099dd99df4..82b1aff6865a 100644
--- a/sys-apps/busybox/busybox-1.6.0.ebuild
+++ b/sys-apps/busybox/busybox-1.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.6.0.ebuild,v 1.1 2007/06/11 04:14:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.6.0.ebuild,v 1.2 2007/06/11 05:10:56 dragonheart Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic savedconfig
 
 ################################################################################
 # BUSYBOX ALTERNATE CONFIG MINI-HOWTO
@@ -13,7 +13,7 @@ inherit eutils flag-o-matic
 #     get erased afterwards. Add a definition like ROOT=/my/root/path to the
 #     start of the line if you're installing to somewhere else than the root
 #     directory. This command will save the default configuration to
-#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
+#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not 
 #     defined), and it will tell you that it has done this. Note the location
 #     where the config file was saved.
 #
@@ -25,25 +25,21 @@ inherit eutils flag-o-matic
 #     cd /var/tmp/portage/busybox*/work
 #     make menuconfig
 #
-#
 # (3) Save your configuration to the default location and copy it to the
-#     savedconfig location as follows. Replace X.X.X by the version of
-#     busybox, and change the path if you're overriding ${ROOT} or
-#     ${PORTAGE_CONFIGROOT}. The file should overwrite the default config
-#     file that was written by the ebuild during step 1.
-#
-#     cp .config /etc/portage/savedconfig/busybox-X.X.X.config
+#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
 #
-# (4) Execute the same command as in step 1 to build the new busybox config;
-#     the FEATURES=keepwork option is probably no longer necessary unless you
-#     want to modify the configuration further.
+# (4) Emerge busybox with USE=savedconfig to use the configuration file you
+#     just generated.
 #
 ################################################################################
 #
-# (1) Alternatively skip the above steps and simply emerge busybox with
-#     USE=savedconfig and edit the file it saves by hand. Then remerge bb as
-#     needed.
+# (1) Alternatively skip the above steps and simply emerge busybox without
+#     USE=savedconfig.
 #
+# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
+#
+# (3) Remerge busybox as using USE=savedconfig.
+#     
 ################################################################################
 
 
@@ -107,25 +103,12 @@ src_unpack() {
 
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
-	# fine grained config control for user defined busybox configs.
-	# [package]-[version]-[revision].config
-	# [package]-[version].config
-	# [package].config
-
-	if use savedconfig ; then
-		local conf root
-		[[ -r .config ]] && rm .config
-		for conf in {${PF},${P},${PN}}{,-${CHOST}} ; do
-			for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" / ; do
-				configfile=${root}etc/portage/savedconfig/${conf}.config
-				if [[ -r ${configfile} ]] ; then
-					einfo "Found your ${configfile} and using it."
-					cp ${configfile} "${S}"/.config
-					yes "" | make oldconfig > /dev/null
-					return 0
-				fi
-			done
-		done
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | make oldconfig > /dev/null
+		return 0
+	else
 		ewarn "Could not locate user configfile, so we will save a default one"
 	fi
 
@@ -176,6 +159,7 @@ src_compile() {
 
 src_install() {
 	unset KBUILD_OUTPUT #88088
+	save_config .config
 
 	into /
 	newbin busybox_unstripped busybox || die
@@ -225,9 +209,6 @@ pkg_preinst() {
 	if use make-symlinks ; then
 		mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
 	fi
-	if use savedconfig ; then
-		mv "${D}"/usr/share/${PN}/${PF}.config "${T}"/ || die
-	fi
 }
 
 pkg_postinst() {
@@ -238,14 +219,6 @@ pkg_postinst() {
 		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
 	fi
 
-	if use savedconfig ; then
-		local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig"
-		einfo "Saving this build config to ${config_dir}/${PF}.config"
-		einfo "Read this ebuild for more info on how to take advantage of this option"
-		mkdir -p "${config_dir}"
-		cp "${T}"/${PF}.config "${config_dir}"/${PF}.config
-		return 0
-	fi
 	echo
 	einfo "This ebuild has support for user defined configs"
 	einfo "Please read this ebuild for more details and re-emerge as needed"