Bump to fix a few buglets that show up if 05kernel is missing or incorrectly formatted

7 files changed, 19 insertions, 36 deletions

diff --git a/sys-kernel/config-kernel/ChangeLog b/sys-kernel/config-kernel/ChangeLog
index 6526486e4405..bcb9dcb119d3 100644
--- a/sys-kernel/config-kernel/ChangeLog
+++ b/sys-kernel/config-kernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/config-kernel
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/config-kernel/ChangeLog,v 1.7 2004/04/03 15:45:59 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/config-kernel/ChangeLog,v 1.8 2004/04/03 16:35:12 latexer Exp $
+
+*config-kernel-0.3.3 (03 Apr 2004)
+
+  03 Apr 2004; Peter Johanson <latexer@gentoo.org> config-kernel-0.3.0.ebuild,
+  config-kernel-0.3.1.ebuild, config-kernel-0.3.3.ebuild:
+  Bump for a few fixes that are only problems if one messes with 05kernel by
+  hand. Remove a few older versions.
 
 *config-kernel-0.3.2-r1 (03 Apr 2004)
 
diff --git a/sys-kernel/config-kernel/Manifest b/sys-kernel/config-kernel/Manifest
index 1a2b1eff39cc..4183475777cb 100644
--- a/sys-kernel/config-kernel/Manifest
+++ b/sys-kernel/config-kernel/Manifest
@@ -1,10 +1,8 @@
 MD5 6fa7dc1ded5c64f2b6a151d27a647ccd config-kernel-0.3.2-r1.ebuild 848
-MD5 01d0b6712b1532297142e06b8a3f0cb7 config-kernel-0.3.0.ebuild 708
+MD5 6fa7dc1ded5c64f2b6a151d27a647ccd config-kernel-0.3.3.ebuild 848
 MD5 a88aa827365c3327e58854e52c807873 config-kernel-0.3.2.ebuild 708
 MD5 a4ba36e4f29b6d9eadf51bdd2cfdd369 ChangeLog 1766
 MD5 63b81b020c259601fc7d3b371f15a55e metadata.xml 391
-MD5 7a2dc8de985e95b69f110efdfe02e67f config-kernel-0.3.1.ebuild 708
 MD5 7643a63979ee1a1dfce17c9e0e74c9d3 files/digest-config-kernel-0.3.2-r1 70
-MD5 8a8f0c44484f5e6aa8639137b3146897 files/digest-config-kernel-0.3.0 70
-MD5 be4ca0a8b496500a48a90178aef5680b files/digest-config-kernel-0.3.1 70
 MD5 7643a63979ee1a1dfce17c9e0e74c9d3 files/digest-config-kernel-0.3.2 70
+MD5 93fc1e9221fd3ad0b6a305ef959986de files/digest-config-kernel-0.3.3 70
diff --git a/sys-kernel/config-kernel/config-kernel-0.3.1.ebuild b/sys-kernel/config-kernel/config-kernel-0.3.1.ebuild
deleted file mode 100644
index 109b39aeea2f..000000000000
--- a/sys-kernel/config-kernel/config-kernel-0.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/config-kernel/config-kernel-0.3.1.ebuild,v 1.1 2004/03/26 21:07:49 latexer Exp $
-
-inherit distutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Kernel enviroment configuration tool"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~latexer/files/koutput/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-RDEPEND="virtual/python"
-KEYWORDS="x86"
-IUSE=""
-
-src_install() {
-	distutils_src_install
-	dobin ${S}/config-kernel
-	doman ${S}/config-kernel.1
-	dodoc ChangeLog
-
-	if [ ! -e /etc/env.d/05kernel ]
-	then
-		insinto /etc/env.d
-		doins 05kernel
-	fi
-}
diff --git a/sys-kernel/config-kernel/config-kernel-0.3.0.ebuild b/sys-kernel/config-kernel/config-kernel-0.3.3.ebuild
index 04159390ab8e..0c81a9920ea7 100644
--- a/sys-kernel/config-kernel/config-kernel-0.3.0.ebuild
+++ b/sys-kernel/config-kernel/config-kernel-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/config-kernel/config-kernel-0.3.0.ebuild,v 1.1 2004/03/26 19:57:36 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/config-kernel/config-kernel-0.3.3.ebuild,v 1.1 2004/04/03 16:35:12 latexer Exp $
 
 inherit distutils
 
@@ -10,10 +10,17 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~latexer/files/koutput/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
+DEPEND=">=sys-apps/sed-4"
 RDEPEND="virtual/python"
 KEYWORDS="x86"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e 's:^KBUILD_OUTPUT_PREFIX=.*:KBUILD_OUTPUT_PREFIX="":' ${S}/05kernel
+}
+
 src_install() {
 	distutils_src_install
 	dobin ${S}/config-kernel
diff --git a/sys-kernel/config-kernel/files/digest-config-kernel-0.3.0 b/sys-kernel/config-kernel/files/digest-config-kernel-0.3.0
deleted file mode 100644
index a4b8b1bed60f..000000000000
--- a/sys-kernel/config-kernel/files/digest-config-kernel-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 899df4d523d2d43d828b1a81451a1c19 config-kernel-0.3.0.tar.bz2 7356
diff --git a/sys-kernel/config-kernel/files/digest-config-kernel-0.3.1 b/sys-kernel/config-kernel/files/digest-config-kernel-0.3.1
deleted file mode 100644
index 7953ebee2e2c..000000000000
--- a/sys-kernel/config-kernel/files/digest-config-kernel-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e14d3745863d102d8da92a7444478f1a config-kernel-0.3.1.tar.bz2 7423
diff --git a/sys-kernel/config-kernel/files/digest-config-kernel-0.3.3 b/sys-kernel/config-kernel/files/digest-config-kernel-0.3.3
new file mode 100644
index 000000000000..a454b85d3f5a
--- /dev/null
+++ b/sys-kernel/config-kernel/files/digest-config-kernel-0.3.3
@@ -0,0 +1 @@
+MD5 5f848db05692a98ff6c60440ca573ac1 config-kernel-0.3.3.tar.bz2 7409