Version bumped to 3.2.0_pre8 to fix a bug with localversion and 2.4 kernels.

(Portage version: 2.0.51.22-r1)

4 files changed, 13 insertions, 23 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index d1b830ce0e3c..2180be6fb10d 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.86 2005/06/17 17:59:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.87 2005/06/17 19:36:51 wolf31o2 Exp $
+
+*genkernel-3.2.0_pre8 (17 Jun 2005)
+
+  17 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/genkernel-3.2.0_pre7-arch.diff, -genkernel-3.2.0_pre7-r1.ebuild,
+  +genkernel-3.2.0_pre8.ebuild:
+  Version bumped to 3.2.0_pre8 to fix a bug with localversion and 2.4 kernels.
 
   17 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   files/genkernel-3.2.0_pre7-arch.diff, genkernel-3.2.0_pre7-r1.ebuild:
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre7-r1 b/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre8
index b7327d434e33..9eb9f59e09d5 100644
--- a/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre7-r1
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre8
@@ -1,4 +1,4 @@
-MD5 aef0102db9f87a71fc331daff17eda13 genkernel-3.2.0_pre7.tar.bz2 2061108
+MD5 8543804362ace1b8fd6b4d52baeb32dd genkernel-3.2.0_pre8.tar.bz2 2061468
 MD5 8383b009ac61674fae6de442c6dba910 dmraid-1.0.0.rc6.tar.bz2 126327
 MD5 287ed36505eca25ceda7c48c3dfed42c LVM2.2.00.25.tgz 427445
 MD5 b74bb5fa232c77bf74f87eac2f53e1e4 device-mapper.1.00.17.tgz 637694
diff --git a/sys-kernel/genkernel/files/genkernel-3.2.0_pre7-arch.diff b/sys-kernel/genkernel/files/genkernel-3.2.0_pre7-arch.diff
deleted file mode 100644
index 54d7ba484297..000000000000
--- a/sys-kernel/genkernel/files/genkernel-3.2.0_pre7-arch.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN genkernel-3.2.0_pre7.orig/gen_compile.sh genkernel-3.2.0_pre7/gen_compile.sh
---- genkernel-3.2.0_pre7.orig/gen_compile.sh	2005-06-16 14:23:06.000000000 -0400
-+++ genkernel-3.2.0_pre7/gen_compile.sh	2005-06-17 14:02:31.000000000 -0400
-@@ -689,7 +689,13 @@
- 		print_info 1 'udev: >> Compiling...'
- 
- 		ln -snf "${KERNEL_DIR}" klibc/linux || gen_die "Could not link to ${KERNEL_DIR}"
--		compile_generic "ARCH=${ARCH} KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils
-+		if [ "${ARCH}" = 'um' ]
-+		then
-+			compile_generic "ARCH=um KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils
-+		else
-+			compile_generic "KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils
-+		fi
-+
- 
- 		strip udev || gen_die 'Failed to strip the udev binary!'
- 
diff --git a/sys-kernel/genkernel/genkernel-3.2.0_pre7-r1.ebuild b/sys-kernel/genkernel/genkernel-3.2.0_pre8.ebuild
index cbf04627f16f..bc74959e47f7 100644
--- a/sys-kernel/genkernel/genkernel-3.2.0_pre7-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.2.0_pre8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.2.0_pre7-r1.ebuild,v 1.2 2005/06/17 17:59:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.2.0_pre8.ebuild,v 1.1 2005/06/17 19:36:51 wolf31o2 Exp $
 
-inherit eutils
+#inherit eutils
 
 VERSION_DMAP='1.00.17'
 VERSION_DMRAID='1.0.0.rc6'
@@ -28,7 +28,8 @@ DEPEND="sys-fs/e2fsprogs
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	epatch ${FILESDIR}/${P}-arch.diff
+#	epatch ${FILESDIR}/${P}-arch.diff
+#	sed -i 's/prepare0/prepare/' ${S}/gen_determineargs.sh
 }
 
 src_install() {