Updated the live SVN ebuild to work with SVN HEAD, which uses a newer busybox.

Package-Manager: portage-2.1.4.4

3 files changed, 16 insertions, 7 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index ab54e1e6be4c..0294c27d163f 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.193 2008/03/04 00:44:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.194 2008/03/12 03:51:07 wolf31o2 Exp $
+
+  12 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> genkernel-9999.ebuild:
+  Updated the live SVN ebuild to work with SVN HEAD, which uses a newer busybox.
 
 *genkernel-3.4.10_pre4 (04 Mar 2008)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 4a747544c927..2066e46e45d2 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
 DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb
+DIST busybox-1.7.4.tar.bz2 1727940 RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c19b SHA1 e5dcaa25525ca63663c3d4e7027897fed54a4f95 SHA256 8480a7c1b9ac0fddff55e8daae807ccf0a47aa292137fa8c9f97cf0733b459c7
 DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
@@ -15,13 +16,13 @@ DIST unionfs-1.5pre-cvs200701042308.tar.gz 163418 RMD160 6d54be6db26a562dd943df2
 EBUILD genkernel-3.4.10_pre3.ebuild 4033 RMD160 7a8a0ca0446eba2854a67e20ea46135bdaab33a2 SHA1 7bbbb2d2a8d5abf14ae4f80a4b9f59d1baa09470 SHA256 6e9a87fa648eb242740494b45ac2437bc8b1585e7e88f3a19b7ab3836842f00f
 EBUILD genkernel-3.4.10_pre4.ebuild 4033 RMD160 f44f86ef9ff3864e76ffbf729f8043c732a4c242 SHA1 b4790b57af4d3b9563f1a6b8d7f507201606a257 SHA256 403bc40c40676b8631b9dbeb7852626062d7582b64a79600b29412246f40f283
 EBUILD genkernel-3.4.9.ebuild 3727 RMD160 db052ce94581209bf666290c3bcfc415f5028ae2 SHA1 10fd64150a842c0f98fb6eacf6e577051b9999c8 SHA256 1843149fd24176e38e5de48527a5f4211a4aee6aeffc67cb8a8dd2e26bd81534
-EBUILD genkernel-9999.ebuild 4026 RMD160 8f70b476760587f28d320921675d19b8e942b8c9 SHA1 62f6711f00b33e632c25794173ac6e83e0bfddbe SHA256 efc27ba78c827c1ab64b7f69911e05724f354aea8005db90819f46a0b32175c2
-MISC ChangeLog 37444 RMD160 1f90dd135e1f6028b2337a673cfbe28be30d7da6 SHA1 79cb0cf6467f1fca15f3b8bdd9212e3ad551b09b SHA256 e03fa80d9502d8e08534f93ac41b868d6827ac4cf2e0fd08ff6a549257597a14
+EBUILD genkernel-9999.ebuild 4237 RMD160 ef3be2a2a1c0cb00859bf5c36929ac6a03085f4e SHA1 636d19b1aefb5521dacbfed58751d5ac6b9d94ac SHA256 ee1f60dd61f705352385e221975ca76d97f55c75ad57bdb8d840c0df63257161
+MISC ChangeLog 37603 RMD160 5b21320fd847d5ee6ad8c4b05ca510e7045020d0 SHA1 699962dd422f1ed56f56252f75c368755ede491a SHA256 123bac11312830114e3b502064b2fa7daa4ce1b223737a309babf057d60999c7
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHzJtkkT4lNIS36YERArtfAJ980f6PSUuouyUGD1LRSuYD+iuiigCfT4TZ
-5Y4FZ1hB2ZeT7REzPiuDudA=
-=i5gR
+iD8DBQFH11MqkT4lNIS36YERApNuAJ9qKvpU8KqhrTCzI1zC8pQ1cLjsBQCfZ72A
+IlbQtPSuePrFuVDof914ezo=
+=Km1P
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index bd43cc01df25..1fe2005688cc 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.4 2008/02/21 04:10:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.5 2008/03/12 03:51:07 wolf31o2 Exp $
 
 # genkernel-9999        -> latest SVN
 # genkernel-9999.REV    -> use SVN REV
 # genkernel-VERSION     -> normal genkernel release
 
+VERSION_BUSYBOX='1.7.4'
 VERSION_DMAP='1.02.22'
 VERSION_DMRAID='1.0.0.rc14'
 VERSION_E2FSPROGS='1.39'
@@ -15,6 +16,7 @@ VERSION_PKG='3.4-r4'
 MY_HOME="http://dev.gentoo.org/~wolf31o2"
 RH_HOME="ftp://sources.redhat.com/pub"
 DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
 
 COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
@@ -22,6 +24,7 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
 		${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz
 		${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
 		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
 
 if [[ ${PV} == 9999* ]]
@@ -74,6 +77,7 @@ src_install() {
 		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
 		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
 		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "S:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
@@ -95,6 +99,7 @@ src_install() {
 	"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
 	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
 	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
+	"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
 	"${D}"/usr/share/genkernel/pkg || die "copying pkg"
 
 	dobashcompletion "${FILESDIR}"/genkernel.bash