Cleaning up quoting, removing older ebuilds, and marking 3.4.9_pre6 stable. I normally wouldn't stable a pre-release, but we've been using it in release building and it resolves too many user bugs to not go stable.

(Portage version: 2.1.3.19)

11 files changed, 18 insertions, 563 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 2288532e88d4..50aca3476c6e 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.178 2007/11/02 00:43:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.179 2007/11/07 19:44:52 wolf31o2 Exp $
+
+  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/suspend-0.5-Makefile.patch, -genkernel-3.4.9_pre2.ebuild,
+  -genkernel-3.4.9_pre3.ebuild, -genkernel-3.4.9_pre4.ebuild,
+  -genkernel-3.4.9_pre5.ebuild, genkernel-3.4.9_pre6.ebuild:
+  Cleaning up quoting, removing older ebuilds, and marking 3.4.9_pre6 stable.
+  I normally wouldn't stable a pre-release, but we've been using it in release
+  building and it resolves too many user bugs to not go stable.
 
 *genkernel-3.4.9_pre6 (02 Nov 2007)
 
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre2 b/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre2
deleted file mode 100644
index 72f7d290d27f..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre2
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 a03249bd9f16510dbef241b0f15f9b83 LVM2.2.02.10.tgz 490592
-RMD160 0f0e873ab9651ee0216336bcde79ac16d86d0595 LVM2.2.02.10.tgz 490592
-SHA256 4108de3f4f9f55f29cb6f3e469c44cfa35c6dfcf3a66cae4499e98594ec046c9 LVM2.2.02.10.tgz 490592
-MD5 37cb592a1fa8fc31dc00cb437bbb4969 device-mapper.1.02.19.tgz 183064
-RMD160 00b584c67856ab18323bcc2918aed5ac4198cb65 device-mapper.1.02.19.tgz 183064
-SHA256 4723a4ba55e10c58a4e1bd7551e1e7d90ce43d3fcdabfd78285d39c2d33cdead device-mapper.1.02.19.tgz 183064
-MD5 a0e7d0bb5394e15c878ac86afd72c08e dmraid-1.0.0.rc14.tar.bz2 164234
-RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c dmraid-1.0.0.rc14.tar.bz2 164234
-SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec dmraid-1.0.0.rc14.tar.bz2 164234
-MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
-RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
-SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
-MD5 d80f049c297e8ff70c04a817d8102384 genkernel-3.4.9_pre2.tar.bz2 180904
-RMD160 50066e099db8334057b18ccfcab671cf078a1f0d genkernel-3.4.9_pre2.tar.bz2 180904
-SHA256 b6a3036d20713c89a656c87ed0dc2b21ac37941371d4ae3adf7fb88f582b826b genkernel-3.4.9_pre2.tar.bz2 180904
-MD5 b100c516c1f17cfe68eb88e0840cf6d7 genkernel-pkg-3.4-r1.tar.bz2 1865353
-RMD160 56e85293937122aa2e42d70d02f15e2f5a99d62b genkernel-pkg-3.4-r1.tar.bz2 1865353
-SHA256 e3ed36492a76c95ddc928fe3d871117707eb0625c50448596939f5b761ce6bcc genkernel-pkg-3.4-r1.tar.bz2 1865353
-MD5 c0a89e47eeaf14ec68f9114f74b16d09 suspend-0.5.tar.gz 163148
-RMD160 8b38fcb18c7f860b4c292a4329f268bce6dc177a suspend-0.5.tar.gz 163148
-SHA256 ab87f1ee097dab98b4d56f98c95779a47a859de81512292743213e6bd5a352f1 suspend-0.5.tar.gz 163148
-MD5 89d736859e5547db1384229160ad5410 unionfs-1.5pre-cvs200701042308.tar.gz 163418
-RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f unionfs-1.5pre-cvs200701042308.tar.gz 163418
-SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271 unionfs-1.5pre-cvs200701042308.tar.gz 163418
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre3 b/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre3
deleted file mode 100644
index 23a33511a460..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre3
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 a03249bd9f16510dbef241b0f15f9b83 LVM2.2.02.10.tgz 490592
-RMD160 0f0e873ab9651ee0216336bcde79ac16d86d0595 LVM2.2.02.10.tgz 490592
-SHA256 4108de3f4f9f55f29cb6f3e469c44cfa35c6dfcf3a66cae4499e98594ec046c9 LVM2.2.02.10.tgz 490592
-MD5 37cb592a1fa8fc31dc00cb437bbb4969 device-mapper.1.02.19.tgz 183064
-RMD160 00b584c67856ab18323bcc2918aed5ac4198cb65 device-mapper.1.02.19.tgz 183064
-SHA256 4723a4ba55e10c58a4e1bd7551e1e7d90ce43d3fcdabfd78285d39c2d33cdead device-mapper.1.02.19.tgz 183064
-MD5 a0e7d0bb5394e15c878ac86afd72c08e dmraid-1.0.0.rc14.tar.bz2 164234
-RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c dmraid-1.0.0.rc14.tar.bz2 164234
-SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec dmraid-1.0.0.rc14.tar.bz2 164234
-MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
-RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
-SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
-MD5 8313f4a75eabf1f7a2ff96b1eda23ed1 genkernel-3.4.9_pre3.tar.bz2 177523
-RMD160 a10b7097b87f18e643ae8cf83ffd62e3d061f070 genkernel-3.4.9_pre3.tar.bz2 177523
-SHA256 e708eb3d4671a2b7bc3085200445f2acd4253c8951971bba84c5b378ed071a54 genkernel-3.4.9_pre3.tar.bz2 177523
-MD5 b100c516c1f17cfe68eb88e0840cf6d7 genkernel-pkg-3.4-r1.tar.bz2 1865353
-RMD160 56e85293937122aa2e42d70d02f15e2f5a99d62b genkernel-pkg-3.4-r1.tar.bz2 1865353
-SHA256 e3ed36492a76c95ddc928fe3d871117707eb0625c50448596939f5b761ce6bcc genkernel-pkg-3.4-r1.tar.bz2 1865353
-MD5 89d736859e5547db1384229160ad5410 unionfs-1.5pre-cvs200701042308.tar.gz 163418
-RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f unionfs-1.5pre-cvs200701042308.tar.gz 163418
-SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271 unionfs-1.5pre-cvs200701042308.tar.gz 163418
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre4 b/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre4
deleted file mode 100644
index b8ee1482f07d..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre4
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 940a882a71cae84f6befc8069a260ad1 LVM2.2.02.28.tgz 531905
-RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 LVM2.2.02.28.tgz 531905
-SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb LVM2.2.02.28.tgz 531905
-MD5 6b94db57cdc9022af1583b3f2acb91cd device-mapper.1.02.22.tgz 189726
-RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 device-mapper.1.02.22.tgz 189726
-SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 device-mapper.1.02.22.tgz 189726
-MD5 a0e7d0bb5394e15c878ac86afd72c08e dmraid-1.0.0.rc14.tar.bz2 164234
-RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c dmraid-1.0.0.rc14.tar.bz2 164234
-SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec dmraid-1.0.0.rc14.tar.bz2 164234
-MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
-RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
-SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
-MD5 da039439594ee6fe90fcf3ff550904da genkernel-3.4.9_pre4.tar.bz2 177546
-RMD160 50220fe9b63d2ab34507f7657f4a3dc107a9a4b2 genkernel-3.4.9_pre4.tar.bz2 177546
-SHA256 aff88fbd17cf8e770fec6e610d6c10a4a1ed35a735807dc5dc72b8f4ee93d2cf genkernel-3.4.9_pre4.tar.bz2 177546
-MD5 8c8d2237555602e9feba657025a12aef genkernel-pkg-3.4-r2.tar.bz2 1909178
-RMD160 49e0fc62c07cfd2f91868087a6703004cd7e1c3f genkernel-pkg-3.4-r2.tar.bz2 1909178
-SHA256 322b840786316a811cb1f4c4f9c589283081205fb0e911e2469ac5cd9682ace5 genkernel-pkg-3.4-r2.tar.bz2 1909178
-MD5 89d736859e5547db1384229160ad5410 unionfs-1.5pre-cvs200701042308.tar.gz 163418
-RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f unionfs-1.5pre-cvs200701042308.tar.gz 163418
-SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271 unionfs-1.5pre-cvs200701042308.tar.gz 163418
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre5 b/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre5
deleted file mode 100644
index 3c00f9f5cd06..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre5
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 940a882a71cae84f6befc8069a260ad1 LVM2.2.02.28.tgz 531905
-RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 LVM2.2.02.28.tgz 531905
-SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb LVM2.2.02.28.tgz 531905
-MD5 6b94db57cdc9022af1583b3f2acb91cd device-mapper.1.02.22.tgz 189726
-RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 device-mapper.1.02.22.tgz 189726
-SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 device-mapper.1.02.22.tgz 189726
-MD5 a0e7d0bb5394e15c878ac86afd72c08e dmraid-1.0.0.rc14.tar.bz2 164234
-RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c dmraid-1.0.0.rc14.tar.bz2 164234
-SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec dmraid-1.0.0.rc14.tar.bz2 164234
-MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
-RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
-SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
-MD5 91dc5f6256a05158c8d151263272e67c genkernel-3.4.9_pre5.tar.bz2 177513
-RMD160 6f555db07af808e4b73f370d424fe68736e7a165 genkernel-3.4.9_pre5.tar.bz2 177513
-SHA256 14e6d1723e018bba448a74dbcd51567f08ade3c5ac39b03b5029ee1be3eb005b genkernel-3.4.9_pre5.tar.bz2 177513
-MD5 8c8d2237555602e9feba657025a12aef genkernel-pkg-3.4-r2.tar.bz2 1909178
-RMD160 49e0fc62c07cfd2f91868087a6703004cd7e1c3f genkernel-pkg-3.4-r2.tar.bz2 1909178
-SHA256 322b840786316a811cb1f4c4f9c589283081205fb0e911e2469ac5cd9682ace5 genkernel-pkg-3.4-r2.tar.bz2 1909178
-MD5 89d736859e5547db1384229160ad5410 unionfs-1.5pre-cvs200701042308.tar.gz 163418
-RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f unionfs-1.5pre-cvs200701042308.tar.gz 163418
-SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271 unionfs-1.5pre-cvs200701042308.tar.gz 163418
diff --git a/sys-kernel/genkernel/files/suspend-0.5-Makefile.patch b/sys-kernel/genkernel/files/suspend-0.5-Makefile.patch
deleted file mode 100644
index d74a10cffe00..000000000000
--- a/sys-kernel/genkernel/files/suspend-0.5-Makefile.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
-From: Daniel Drake <ddrake@brontes3d.com>
-
-Index: suspend-0.5/Makefile
-===================================================================
---- suspend-0.5.orig/Makefile
-+++ suspend-0.5/Makefile
-@@ -1,14 +1,14 @@
- #CONFIG_COMPRESS=yes
- #CONFIG_ENCRYPT=yes
- #CONFIG_SPLASHY=yes
--#CONFIG_UDEV=yes
-+CONFIG_UDEV=yes
- 
- ARCH:=$(shell uname -m)
- 
--CC_FLAGS=-I/usr/local/include
--LD_FLAGS=-L/usr/local/lib
-+CC_FLAGS?=-I/usr/local/include
-+LD_FLAGS?=-L/usr/local/lib
- 
--CFLAGS := -O2 -Wall
-+CFLAGS ?= -O2 -Wall
- 
- ifdef CONFIG_COMPRESS
- CC_FLAGS	+= -DCONFIG_COMPRESS
-@@ -22,7 +22,7 @@ CC_FLAGS	+= $(GCRYPT_CC_FLAGS)
- LD_FLAGS	+= $(GCRYPT_LD_FLAGS)
- endif
- 
--SUSPEND_DIR=/usr/local/sbin
-+SUSPEND_DIR?=/usr/local/sbin
- CONFIG_DIR=/etc
- RESUME_DEVICE=<path_to_resume_device_file>
- BOOT_DIR=/boot
-@@ -31,7 +31,7 @@ S2BOTH=s2both
- S2DISK=s2disk
- CONFIGFILE=suspend.conf
- 
--ifndef CONFIG_UDEV
-+ifneq ($(CONFIG_UDEV), yes)
- SNAPSHOT=$(DESTDIR)/dev/snapshot
- endif
- 
-@@ -145,9 +145,9 @@ install-s2disk: $(S2DISK) swap-offset co
- 	if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR); fi
- 
- install: $(S2DISK) $(S2BOTH) swap-offset conf/$(CONFIGFILE) $(SNAPSHOT)
--	install --mode=755 $(S2DISK) $(DESTDIR)$(SUSPEND_DIR)
-+	install -D --mode=755 $(S2DISK) $(DESTDIR)$(SUSPEND_DIR)/$(S2DISK)
- 	install --mode=755 $(S2BOTH) $(DESTDIR)$(SUSPEND_DIR)
--	if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR); fi
-+	if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install -D --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE); fi
- 	install --mode=755 s2ram $(DESTDIR)$(SUSPEND_DIR)
- 	install --mode=755 resume $(DESTDIR)$(SUSPEND_DIR)
- 	install --mode=755 swap-offset $(DESTDIR)$(SUSPEND_DIR)
diff --git a/sys-kernel/genkernel/genkernel-3.4.9_pre2.ebuild b/sys-kernel/genkernel/genkernel-3.4.9_pre2.ebuild
deleted file mode 100644
index 61cfbe39c773..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.9_pre2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.9_pre2.ebuild,v 1.1 2007/08/30 18:32:53 wolf31o2 Exp $
-
-inherit bash-completion eutils
-
-VERSION_DMAP='1.02.19'
-VERSION_DMRAID='1.0.0.rc14'
-VERSION_E2FSPROGS='1.39'
-VERSION_LVM2='2.02.10'
-VERSION_PKG='3.4-r1'
-VERSION_SUSPEND='0.5'
-VERSION_UNIONFS='1.5pre-cvs200701042308'
-
-DESCRIPTION="Gentoo autokernel build scripts"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${P}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${VERSION_DMRAID}.tar.bz2
-	ftp://sources.redhat.com/pub/lvm2/old/LVM2.${VERSION_LVM2}.tgz
-	ftp://sources.redhat.com/pub/dm/old/device-mapper.${VERSION_DMAP}.tgz
-	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/snapshots/unionfs-${VERSION_UNIONFS}.tar.gz
-	mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz
-	mirror://sourceforge/suspend/suspend-${VERSION_SUSPEND}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
-# Release Engineering, it's easier for us to deal with all arches at once.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND} app-arch/cpio"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
-	cp ${FILESDIR}/suspend-0.5-Makefile.patch pkg
-	use selinux && sed -i 's/###//g' gen_compile.sh
-}
-
-src_install() {
-	dodir /etc
-	cp "${S}"/genkernel.conf ${D}/etc
-	# This block updates genkernel.conf
-	sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
-		-e "s:VERSION_LVM2:$VERSION_LVM2:" \
-		-e "s:VERSION_UNIONFS:$VERSION_UNIONFS:" \
-		-e "s:VERSION_SUSPEND:$VERSION_SUSPEND:" \
-		${D}/etc/genkernel.conf || die "Could not adjust versions"
-
-	dodir /usr/share/genkernel
-	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
-		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
-	cp -Rp "${S}"/* ${D}/usr/share/genkernel
-
-	dodir /usr/bin
-	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
-
-	rm ${D}/usr/share/genkernel/genkernel.conf
-	dodoc README
-
-	doman genkernel.8
-	rm genkernel.8
-
-	cp "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-	"${DISTDIR}"/LVM2.${VERSION_LVM2}.tgz \
-	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-	"${DISTDIR}"/unionfs-${VERSION_UNIONFS}.tar.gz \
-	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	"${DISTDIR}"/suspend-${VERSION_SUSPEND}.tar.gz \
-	${D}/usr/share/genkernel/pkg
-
-	dobashcompletion ${FILESDIR}/genkernel.bash
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
-	ewarn "even reiser3."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-
-	bash-completion_pkg_postinst
-}
diff --git a/sys-kernel/genkernel/genkernel-3.4.9_pre3.ebuild b/sys-kernel/genkernel/genkernel-3.4.9_pre3.ebuild
deleted file mode 100644
index 567c4005462c..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.9_pre3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.9_pre3.ebuild,v 1.1 2007/09/17 20:25:35 wolf31o2 Exp $
-
-inherit bash-completion eutils
-
-VERSION_DMAP='1.02.19'
-VERSION_DMRAID='1.0.0.rc14'
-VERSION_E2FSPROGS='1.39'
-VERSION_LVM2='2.02.10'
-VERSION_PKG='3.4-r1'
-VERSION_UNIONFS='1.5pre-cvs200701042308'
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${P}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${VERSION_DMRAID}.tar.bz2
-	ftp://sources.redhat.com/pub/lvm2/LVM2.${VERSION_LVM2}.tgz
-	ftp://sources.redhat.com/pub/lvm2/old/LVM2.${VERSION_LVM2}.tgz
-	ftp://sources.redhat.com/pub/dm/device-mapper.${VERSION_DMAP}.tgz
-	ftp://sources.redhat.com/pub/dm/old/device-mapper.${VERSION_DMAP}.tgz
-	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/snapshots/unionfs-${VERSION_UNIONFS}.tar.gz
-	mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
-# Release Engineering, it's easier for us to deal with all arches at once.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND} app-arch/cpio"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
-	use selinux && sed -i 's/###//g' gen_compile.sh
-}
-
-src_install() {
-	dodir /etc
-	cp "${S}"/genkernel.conf ${D}/etc
-	# This block updates genkernel.conf
-	sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
-		-e "s:VERSION_LVM2:$VERSION_LVM2:" \
-		-e "s:VERSION_UNIONFS:$VERSION_UNIONFS:" \
-		${D}/etc/genkernel.conf || die "Could not adjust versions"
-
-	dodir /usr/share/genkernel
-	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
-		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
-	cp -Rp "${S}"/* ${D}/usr/share/genkernel
-
-	dodir /usr/bin
-	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
-
-	rm ${D}/usr/share/genkernel/genkernel.conf
-	dodoc README
-
-	doman genkernel.8
-	rm genkernel.8
-
-	cp "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-	"${DISTDIR}"/LVM2.${VERSION_LVM2}.tgz \
-	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-	"${DISTDIR}"/unionfs-${VERSION_UNIONFS}.tar.gz \
-	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	${D}/usr/share/genkernel/pkg
-
-	dobashcompletion ${FILESDIR}/genkernel.bash
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
-	ewarn "even reiser3."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-
-	bash-completion_pkg_postinst
-}
diff --git a/sys-kernel/genkernel/genkernel-3.4.9_pre4.ebuild b/sys-kernel/genkernel/genkernel-3.4.9_pre4.ebuild
deleted file mode 100644
index 461d6943731e..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.9_pre4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.9_pre4.ebuild,v 1.1 2007/10/30 20:32:25 wolf31o2 Exp $
-
-inherit bash-completion eutils
-
-VERSION_DMAP='1.02.22'
-VERSION_DMRAID='1.0.0.rc14'
-VERSION_E2FSPROGS='1.39'
-VERSION_LVM2='2.02.28'
-VERSION_PKG='3.4-r2'
-VERSION_UNIONFS='1.5pre-cvs200701042308'
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${P}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${VERSION_DMRAID}.tar.bz2
-	ftp://sources.redhat.com/pub/lvm2/LVM2.${VERSION_LVM2}.tgz
-	ftp://sources.redhat.com/pub/lvm2/old/LVM2.${VERSION_LVM2}.tgz
-	ftp://sources.redhat.com/pub/dm/device-mapper.${VERSION_DMAP}.tgz
-	ftp://sources.redhat.com/pub/dm/old/device-mapper.${VERSION_DMAP}.tgz
-	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/snapshots/unionfs-${VERSION_UNIONFS}.tar.gz
-	mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
-# Release Engineering, it's easier for us to deal with all arches at once.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND} app-arch/cpio"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
-	use selinux && sed -i 's/###//g' gen_compile.sh
-}
-
-src_install() {
-	dodir /etc
-	cp "${S}"/genkernel.conf ${D}/etc
-	# This block updates genkernel.conf
-	sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
-		-e "s:VERSION_LVM2:$VERSION_LVM2:" \
-		-e "s:VERSION_UNIONFS:$VERSION_UNIONFS:" \
-		${D}/etc/genkernel.conf || die "Could not adjust versions"
-
-	dodir /usr/share/genkernel
-	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
-		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
-	cp -Rp "${S}"/* ${D}/usr/share/genkernel
-
-	dodir /usr/bin
-	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
-
-	rm ${D}/usr/share/genkernel/genkernel.conf
-	dodoc README
-
-	doman genkernel.8
-	rm genkernel.8
-
-	cp "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-	"${DISTDIR}"/LVM2.${VERSION_LVM2}.tgz \
-	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-	"${DISTDIR}"/unionfs-${VERSION_UNIONFS}.tar.gz \
-	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	${D}/usr/share/genkernel/pkg
-
-	dobashcompletion ${FILESDIR}/genkernel.bash
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
-	ewarn "even reiser3."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-
-	bash-completion_pkg_postinst
-}
diff --git a/sys-kernel/genkernel/genkernel-3.4.9_pre5.ebuild b/sys-kernel/genkernel/genkernel-3.4.9_pre5.ebuild
deleted file mode 100644
index 3bdb19797508..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.9_pre5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.9_pre5.ebuild,v 1.1 2007/11/01 00:58:58 wolf31o2 Exp $
-
-inherit bash-completion eutils
-
-VERSION_DMAP='1.02.22'
-VERSION_DMRAID='1.0.0.rc14'
-VERSION_E2FSPROGS='1.39'
-VERSION_LVM2='2.02.28'
-VERSION_PKG='3.4-r2'
-VERSION_UNIONFS='1.5pre-cvs200701042308'
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${P}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${VERSION_DMRAID}.tar.bz2
-	ftp://sources.redhat.com/pub/lvm2/LVM2.${VERSION_LVM2}.tgz
-	ftp://sources.redhat.com/pub/lvm2/old/LVM2.${VERSION_LVM2}.tgz
-	ftp://sources.redhat.com/pub/dm/device-mapper.${VERSION_DMAP}.tgz
-	ftp://sources.redhat.com/pub/dm/old/device-mapper.${VERSION_DMAP}.tgz
-	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/snapshots/unionfs-${VERSION_UNIONFS}.tar.gz
-	mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
-# Release Engineering, it's easier for us to deal with all arches at once.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND} app-arch/cpio"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
-	use selinux && sed -i 's/###//g' gen_compile.sh
-}
-
-src_install() {
-	dodir /etc
-	cp "${S}"/genkernel.conf ${D}/etc
-	# This block updates genkernel.conf
-	sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
-		-e "s:VERSION_LVM2:$VERSION_LVM2:" \
-		-e "s:VERSION_UNIONFS:$VERSION_UNIONFS:" \
-		${D}/etc/genkernel.conf || die "Could not adjust versions"
-
-	dodir /usr/share/genkernel
-	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
-		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
-	cp -Rp "${S}"/* ${D}/usr/share/genkernel
-
-	dodir /usr/bin
-	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
-
-	rm ${D}/usr/share/genkernel/genkernel.conf
-	dodoc README
-
-	doman genkernel.8
-	rm genkernel.8
-
-	cp "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-	"${DISTDIR}"/LVM2.${VERSION_LVM2}.tgz \
-	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-	"${DISTDIR}"/unionfs-${VERSION_UNIONFS}.tar.gz \
-	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	${D}/usr/share/genkernel/pkg
-
-	dobashcompletion ${FILESDIR}/genkernel.bash
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
-	ewarn "even reiser3."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-
-	bash-completion_pkg_postinst
-}
diff --git a/sys-kernel/genkernel/genkernel-3.4.9_pre6.ebuild b/sys-kernel/genkernel/genkernel-3.4.9_pre6.ebuild
index 3325e013a593..a439e6b1f148 100644
--- a/sys-kernel/genkernel/genkernel-3.4.9_pre6.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.9_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.9_pre6.ebuild,v 1.1 2007/11/02 00:43:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.9_pre6.ebuild,v 1.2 2007/11/07 19:44:52 wolf31o2 Exp $
 
 inherit bash-completion eutils
 
@@ -31,8 +31,8 @@ SLOT="0"
 RESTRICT=""
 # Please don't touch individual KEYWORDS.  Since this is maintained/tested by
 # Release Engineering, it's easier for us to deal with all arches at once.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="ibm selinux"
 
 DEPEND="sys-fs/e2fsprogs
@@ -48,24 +48,24 @@ src_unpack() {
 
 src_install() {
 	dodir /etc
-	cp "${S}"/genkernel.conf ${D}/etc
+	cp "${S}"/genkernel.conf "${D}"/etc
 	# This block updates genkernel.conf
 	sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \
 		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
 		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
 		-e "s:VERSION_LVM2:$VERSION_LVM2:" \
 		-e "s:VERSION_UNIONFS:$VERSION_UNIONFS:" \
-		${D}/etc/genkernel.conf || die "Could not adjust versions"
+		"${D}"/etc/genkernel.conf || die "Could not adjust versions"
 
 	dodir /usr/share/genkernel
 	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
 		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
-	cp -Rp "${S}"/* ${D}/usr/share/genkernel
+	cp -Rp "${S}"/* "${D}"/usr/share/genkernel
 
 	dodir /usr/bin
 	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
 
-	rm ${D}/usr/share/genkernel/genkernel.conf
+	rm -f "${D}"/usr/share/genkernel/genkernel.conf
 	dodoc README
 
 	doman genkernel.8
@@ -76,9 +76,9 @@ src_install() {
 	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
 	"${DISTDIR}"/unionfs-${VERSION_UNIONFS}.tar.gz \
 	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	${D}/usr/share/genkernel/pkg
+	"${D}"/usr/share/genkernel/pkg
 
-	dobashcompletion ${FILESDIR}/genkernel.bash
+	dobashcompletion "${FILESDIR}"/genkernel.bash
 }
 
 pkg_postinst() {