Punt USE=netboot #159490 by Maciej Grela.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 8629fd5514aefaa41d058a2d1b13f3c406aa32f3..7e718fb311c24a7b79d63ac8d9db4f7996748fb0 100644 (file)
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.118 2006/12/29 23:29:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.119 2006/12/30 18:24:40 vapier Exp $
+
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> busybox-1.3.1.ebuild:
+  Punt USE=netboot #159490 by Maciej Grela.
 
 *busybox-1.3.1 (29 Dec 2006)
 

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a63f130976c5a5d1212fe63a55120141ccbb9bc1..7623ede85d4f34a7be6b16a13c207c4f53a945e8 100644 (file)
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -27,14 +27,14 @@ EBUILD busybox-1.2.2.1.ebuild 8397 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b
 MD5 3bedcbbfebb81d7ed0fe15c8b9a592ff busybox-1.2.2.1.ebuild 8397
 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b4a busybox-1.2.2.1.ebuild 8397
 SHA256 9718421ca42699dd35d17400731157942d102fb3a3f23123301a0762509a5cca busybox-1.2.2.1.ebuild 8397
-EBUILD busybox-1.3.1.ebuild 8372 RMD160 d485ccd1ffd79753f8937b501f0c04ee683165d9 SHA1 4807384c9c56b02ef44744045f9d2be8850a208a SHA256 20230db282192cdb5bfcce13e6d8bd333ab89c48c8d11ee4e91efdfaa7e88ae8
-MD5 7995adcda1ae5815eaafb4e59d43a3ea busybox-1.3.1.ebuild 8372
-RMD160 d485ccd1ffd79753f8937b501f0c04ee683165d9 busybox-1.3.1.ebuild 8372
-SHA256 20230db282192cdb5bfcce13e6d8bd333ab89c48c8d11ee4e91efdfaa7e88ae8 busybox-1.3.1.ebuild 8372
-MISC ChangeLog 18950 RMD160 c4827aab26988e1c1310f4e0a98e9fa8fe7479b4 SHA1 006649047db4af7792031361d1eef2428c02b584 SHA256 5e702dfb096ee9f8eb1c1eb3d0db5b0648ef0f5f48a1dcf23f847fb09c88fe85
-MD5 0710ba26484f45d7e0410ce63189a39a ChangeLog 18950
-RMD160 c4827aab26988e1c1310f4e0a98e9fa8fe7479b4 ChangeLog 18950
-SHA256 5e702dfb096ee9f8eb1c1eb3d0db5b0648ef0f5f48a1dcf23f847fb09c88fe85 ChangeLog 18950
+EBUILD busybox-1.3.1.ebuild 8137 RMD160 6a45b0784f9bb62da00a1e33489db5d1898cf290 SHA1 f2e7d474f523dcb843edd057f92e243c506ad193 SHA256 5a721e39af41f1658a20431fe4e3a1ab0b7270b822db7df290d86f5f04cb5c71
+MD5 a91a747cf07937490d49dde218a04e71 busybox-1.3.1.ebuild 8137
+RMD160 6a45b0784f9bb62da00a1e33489db5d1898cf290 busybox-1.3.1.ebuild 8137
+SHA256 5a721e39af41f1658a20431fe4e3a1ab0b7270b822db7df290d86f5f04cb5c71 busybox-1.3.1.ebuild 8137
+MISC ChangeLog 19067 RMD160 4bfd1566a65971f0beedf7335634b01ac7e996e0 SHA1 90377bc2667973b365a5c3084dee3479750935b7 SHA256 5f4b8abc5efea730b68204abd8a600d01e40aefcd9344cd78f11a03742471a08
+MD5 031aff1d948137cefc7d21436b4d78bc ChangeLog 19067
+RMD160 4bfd1566a65971f0beedf7335634b01ac7e996e0 ChangeLog 19067
+SHA256 5f4b8abc5efea730b68204abd8a600d01e40aefcd9344cd78f11a03742471a08 ChangeLog 19067
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -48,7 +48,7 @@ SHA256 b06e896a90e122006f6ab811e6fb2f6c08ffe36693c93271e4e1c7bcb82af939 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFlkDp8bi6rjpTunYRAvnaAJ9yNsWKMqxSETNePLv9v6WvgRUgMwCdED42
-0GeljOlyTmZZ0cziSFUD6DA=
-=ecMa
+iD8DBQFFlq8q8bi6rjpTunYRAuvwAJ9/wPJhvYN8L0e+rhCb6jjyTAXTVACfZg0X
+EXoQ/75T0atoDTwn1icALxo=
+=g199
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/busybox/busybox-1.3.1.ebuild b/sys-apps/busybox/busybox-1.3.1.ebuild
index 9d1a90601f146da96b7c5e4e1c05e98ce07a4090..d530b5eb6de3659ddfb31e4ca7a1db66d559acff 100644 (file)
--- a/sys-apps/busybox/busybox-1.3.1.ebuild
+++ b/sys-apps/busybox/busybox-1.3.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.3.1.ebuild,v 1.2 2006/12/30 10:34:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.3.1.ebuild,v 1.3 2006/12/30 18:24:40 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -63,7 +63,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug static savedconfig netboot make-symlinks"
+IUSE="debug static savedconfig make-symlinks"
 RESTRICT="test"
 
 DEPEND=""
@@ -125,13 +125,6 @@ src_unpack() {
                done
                ewarn "Could not locate user configfile, so we will save a default one"
        fi
-       if use netboot ; then
-               cp "${FILESDIR}"/config-netboot .config
-               sed -i \
-                       -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
-                       networking/udhcp/libbb_udhcp.h \
-                       || die "fixing netboot/udhcpc"
-       fi
 
        # setup the config file
        make allyesconfig > /dev/null