Added a small fix for bug #184007 and removing older versions from the tree.

Package-Manager: portage-2.1.3.6

7 files changed, 19 insertions, 284 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 41d24f6c90f4..d1d5eb46efef 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,10 @@
 # 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.171 2007/07/24 19:46:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.172 2007/08/22 02:19:49 wolf31o2 Exp $
+
+  22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  -genkernel-3.4.6.ebuild, -genkernel-3.4.7.ebuild, genkernel-3.4.8.ebuild:
+  Added a small fix for bug #184007 and removing older versions from the tree.
 
   24 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   genkernel-3.4.8.ebuild:
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index e311b821a55f..70efc5ebce0c 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -13,47 +13,29 @@ DIST LVM2.2.02.05.tgz 473621 RMD160 7295f14e64dc25035d46e3512db6cae1b2be5f9b SHA
 DIST device-mapper.1.02.07.tgz 923923 RMD160 517dd7bde6935235f8c22149ef6e0cb80e6c925b SHA1 629288f6b6100f4d6c312d26f25b7a3d15a5f714 SHA256 1e9c16e8f7bcf87bec03103dda63c0d11cdc739f432488b026b4614fd3cabf40
 DIST dmraid-1.0.0.rc13.tar.bz2 170497 RMD160 9b95d68c2177c3bb7c74227c375780d3b4936ef7 SHA1 11c8e352849f7d00157169c672ff59a61b1bc111 SHA256 8497196528d50203053de0f733917b1d85aae416d2136c695a07aee5632b12b9
 DIST e2fsprogs-1.38.tar.gz 3621193 RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c SHA1 aa8915fe43bc7cf5fba633df7041009ce9981551 SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
-DIST genkernel-3.4.6.tar.bz2 169270 RMD160 5d38aeebaab78e55cb49a8dbd63504fae5b8d5be SHA1 829710e7c348fafce59159390ac8dd3bbb1356cb SHA256 e1d56d8d16e67181777281d479ed2d323586cc971226f2c7d716a409ac5da0bf
-DIST genkernel-3.4.7.tar.bz2 177129 RMD160 02600273d157ac00bc930770f44161d402b6e21e SHA1 bb3b8f15fc5a6a6f97c9a223cce35c3c6a3aa039 SHA256 c00260e6eda097be4b083ba61b9ac14056ae86236449067044ab8ad4d7c14560
 DIST genkernel-3.4.8.tar.bz2 177997 RMD160 fd57074d694a960c6299222dcac743d83aeaf412 SHA1 53497ad6fd4c488294e8d46dfdc5c2fa63c76d52 SHA256 efc383e16f489c4028b3841068797d6289bc9bfeb6e6d6f2c3a3fee37f0a25fe
 DIST genkernel-pkg-3.4-r1.tar.bz2 1865353 RMD160 56e85293937122aa2e42d70d02f15e2f5a99d62b SHA1 2e7e6541858a45b7cc7a48c59417ec01cef03868 SHA256 e3ed36492a76c95ddc928fe3d871117707eb0625c50448596939f5b761ce6bcc
-DIST genkernel-pkg-3.4.tar.bz2 1848904 RMD160 09e1baed7e3703b2f6c304656a81a12ba4594083 SHA1 f4baa463d0a7595b1a32b8d7a5fec12caa77736a SHA256 2345a16a3b377e3ffde2f0cca7e82cf3566e03e8bb2098db69210f505a989af3
 DIST suspend-0.5.tar.gz 163148 RMD160 8b38fcb18c7f860b4c292a4329f268bce6dc177a SHA1 6fbcb41ec5bcae277cc6fd6a95d85709e3bfc5a6 SHA256 ab87f1ee097dab98b4d56f98c95779a47a859de81512292743213e6bd5a352f1
-DIST unionfs-1.4.tar.gz 164696 RMD160 5a19ccfd6edf25f55c48ba1b820347572353c7ba SHA1 746fe5b9d6348e6530a85b38cdb8a8e08f513264 SHA256 3ff105782aba722b1f263e408fac638245d302a9c8d0f37ac09e5a80caf0126b
 DIST unionfs-1.5pre-cvs200701042308.tar.gz 163418 RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f SHA1 9559a0ae8e0552a9c3644c85a99c1be601c837fc SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271
-EBUILD genkernel-3.4.6.ebuild 3594 RMD160 f5f0b5b64ed82b1720483cdfd657af02f0d98717 SHA1 8994c95395aca8c8bd77334a970204a4222d8ad9 SHA256 87f6cccebffe812187a43f6657acc3d2f68be847791ac77e5bdc773fa530a278
-MD5 e5a0d4a46a6f280b05b66aab3c35a984 genkernel-3.4.6.ebuild 3594
-RMD160 f5f0b5b64ed82b1720483cdfd657af02f0d98717 genkernel-3.4.6.ebuild 3594
-SHA256 87f6cccebffe812187a43f6657acc3d2f68be847791ac77e5bdc773fa530a278 genkernel-3.4.6.ebuild 3594
-EBUILD genkernel-3.4.7.ebuild 3706 RMD160 00f94411420866ae2333626fee21ae1b4bd9ea56 SHA1 2fd44ee3b699917bc1f8a10cce46976c6ad9f228 SHA256 9bea20c169a7f1b2cfe7da01dea995cd968511572f33b2148d7d2e10f03daa12
-MD5 1146a153d3bb0916fdd26edd29aebdd5 genkernel-3.4.7.ebuild 3706
-RMD160 00f94411420866ae2333626fee21ae1b4bd9ea56 genkernel-3.4.7.ebuild 3706
-SHA256 9bea20c169a7f1b2cfe7da01dea995cd968511572f33b2148d7d2e10f03daa12 genkernel-3.4.7.ebuild 3706
-EBUILD genkernel-3.4.8.ebuild 3706 RMD160 8b86667a95934a15f8ddd000252f6635729df856 SHA1 4eae0bff258c66cd774b9827033b83615cf9e5a6 SHA256 f46b51ac2e74249486aa1bfcf00ada32a37339aaad62fd94febbb7141c8b9167
-MD5 83805971ba244aada06008f4328d6935 genkernel-3.4.8.ebuild 3706
-RMD160 8b86667a95934a15f8ddd000252f6635729df856 genkernel-3.4.8.ebuild 3706
-SHA256 f46b51ac2e74249486aa1bfcf00ada32a37339aaad62fd94febbb7141c8b9167 genkernel-3.4.8.ebuild 3706
-MISC ChangeLog 31568 RMD160 6274f808b223c9f407ae49669f269819d0be0055 SHA1 9c0d061b77fe4a4c6085184224ff10d19e9ed7bc SHA256 0112a161b84831a829bbaffdb42beb7779ee2e6f4d0f5a7da11ae5443596ed0f
-MD5 404d30db92f9cd11b07aab2ec3b3f39b ChangeLog 31568
-RMD160 6274f808b223c9f407ae49669f269819d0be0055 ChangeLog 31568
-SHA256 0112a161b84831a829bbaffdb42beb7779ee2e6f4d0f5a7da11ae5443596ed0f ChangeLog 31568
+EBUILD genkernel-3.4.8.ebuild 3791 RMD160 ac29a5814d96e8c688ad44281b1bd4895fdbc8ab SHA1 64fc68247476039638129829e77caf4526f69275 SHA256 ce95581a95291645d161b40b723e264ac4fd3eb3e1aaa00f8a95579bf8272c93
+MD5 016a237a53e3aa510eff71aa9782618f genkernel-3.4.8.ebuild 3791
+RMD160 ac29a5814d96e8c688ad44281b1bd4895fdbc8ab genkernel-3.4.8.ebuild 3791
+SHA256 ce95581a95291645d161b40b723e264ac4fd3eb3e1aaa00f8a95579bf8272c93 genkernel-3.4.8.ebuild 3791
+MISC ChangeLog 31778 RMD160 81155baf97e45ca185d27ea7cba5c967abda3377 SHA1 51bdf8f27894a28fca798e874b3969e850ae2919 SHA256 eb6c779a49da88ad097af163cd37f462f1e7fdb9e0c89ca53e3619f5fbb2fb3c
+MD5 f69e8a9ad852b33015532ec780667494 ChangeLog 31778
+RMD160 81155baf97e45ca185d27ea7cba5c967abda3377 ChangeLog 31778
+SHA256 eb6c779a49da88ad097af163cd37f462f1e7fdb9e0c89ca53e3619f5fbb2fb3c ChangeLog 31778
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
 MD5 d1947fa848bb0000ed87c2663bcb31e9 metadata.xml 226
 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e metadata.xml 226
 SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b metadata.xml 226
-MD5 5aa430f090399227970e71d82e68e405 files/digest-genkernel-3.4.6 1967
-RMD160 18088124969cbe14f8dc14a9d18e7c284f575e3e files/digest-genkernel-3.4.6 1967
-SHA256 e9c8326f4093d8ba632a806de3139f9b1bfce7e03fa3904f2ee6f4d7a38b22db files/digest-genkernel-3.4.6 1967
-MD5 ab14246951d1487bb236bc081fae4fa9 files/digest-genkernel-3.4.7 2033
-RMD160 d9c35fab9bf9faa0d050119d633ee98fdd13f8d4 files/digest-genkernel-3.4.7 2033
-SHA256 883228c9b0499be593cb8d8221214756968c87af1f3c096433ed66ef2b290b9c files/digest-genkernel-3.4.7 2033
 MD5 6dbd8d329cf2682af35688cc3ae09afb files/digest-genkernel-3.4.8 2033
 RMD160 5d3a559f4916621c1b5366b3eead1a50d0a48acd files/digest-genkernel-3.4.8 2033
 SHA256 55d9abbffb40a2e7ed594df28f1209089fbb37d9cea59d4a4251badc5cf8f097 files/digest-genkernel-3.4.8 2033
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGplcDkT4lNIS36YERAv/aAJ9jjinvinxzVB+Rz2WQ729X4Vb9XgCdE2km
-zzEjziWtZrO3xW9o/jPmjhM=
-=f76L
+iD4DBQFGy51GkT4lNIS36YERAlAgAJ499azQVZKZXSwHk0wy4yw+me949gCWKjFd
+IUtDRdjYTZy4GD7WdUIF4Q==
+=2P43
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.6 b/sys-kernel/genkernel/files/digest-genkernel-3.4.6
deleted file mode 100644
index 97731bb39f06..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.6
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 87d8615a655b9a6c1a0e234eab2485bf LVM2.2.02.05.tgz 473621
-RMD160 7295f14e64dc25035d46e3512db6cae1b2be5f9b LVM2.2.02.05.tgz 473621
-SHA256 707c596c7a2f11cc08d3b1099995be2a4a3859a5454ed5af1a6c5361a821a402 LVM2.2.02.05.tgz 473621
-MD5 460cc211b03af4048ec90c0de2ecd8f7 device-mapper.1.02.07.tgz 923923
-RMD160 517dd7bde6935235f8c22149ef6e0cb80e6c925b device-mapper.1.02.07.tgz 923923
-SHA256 1e9c16e8f7bcf87bec03103dda63c0d11cdc739f432488b026b4614fd3cabf40 device-mapper.1.02.07.tgz 923923
-MD5 a2a8948de7717e2e76a1291fc1daf9d1 dmraid-1.0.0.rc13.tar.bz2 170497
-RMD160 9b95d68c2177c3bb7c74227c375780d3b4936ef7 dmraid-1.0.0.rc13.tar.bz2 170497
-SHA256 8497196528d50203053de0f733917b1d85aae416d2136c695a07aee5632b12b9 dmraid-1.0.0.rc13.tar.bz2 170497
-MD5 d774d4412bfb80d12cf3a4fdfd59de5a e2fsprogs-1.38.tar.gz 3621193
-RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c e2fsprogs-1.38.tar.gz 3621193
-SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7 e2fsprogs-1.38.tar.gz 3621193
-MD5 e13d5b1d732ddc8541cea0f84f82e265 genkernel-3.4.6.tar.bz2 169270
-RMD160 5d38aeebaab78e55cb49a8dbd63504fae5b8d5be genkernel-3.4.6.tar.bz2 169270
-SHA256 e1d56d8d16e67181777281d479ed2d323586cc971226f2c7d716a409ac5da0bf genkernel-3.4.6.tar.bz2 169270
-MD5 2fa8384b099d53f878a1f8ef49214493 genkernel-pkg-3.4.tar.bz2 1848904
-RMD160 09e1baed7e3703b2f6c304656a81a12ba4594083 genkernel-pkg-3.4.tar.bz2 1848904
-SHA256 2345a16a3b377e3ffde2f0cca7e82cf3566e03e8bb2098db69210f505a989af3 genkernel-pkg-3.4.tar.bz2 1848904
-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 38ed4d9e41c20cf398018928d2c62700 unionfs-1.4.tar.gz 164696
-RMD160 5a19ccfd6edf25f55c48ba1b820347572353c7ba unionfs-1.4.tar.gz 164696
-SHA256 3ff105782aba722b1f263e408fac638245d302a9c8d0f37ac09e5a80caf0126b unionfs-1.4.tar.gz 164696
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.7 b/sys-kernel/genkernel/files/digest-genkernel-3.4.7
deleted file mode 100644
index f17b383dbd53..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.7
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 87d8615a655b9a6c1a0e234eab2485bf LVM2.2.02.05.tgz 473621
-RMD160 7295f14e64dc25035d46e3512db6cae1b2be5f9b LVM2.2.02.05.tgz 473621
-SHA256 707c596c7a2f11cc08d3b1099995be2a4a3859a5454ed5af1a6c5361a821a402 LVM2.2.02.05.tgz 473621
-MD5 460cc211b03af4048ec90c0de2ecd8f7 device-mapper.1.02.07.tgz 923923
-RMD160 517dd7bde6935235f8c22149ef6e0cb80e6c925b device-mapper.1.02.07.tgz 923923
-SHA256 1e9c16e8f7bcf87bec03103dda63c0d11cdc739f432488b026b4614fd3cabf40 device-mapper.1.02.07.tgz 923923
-MD5 a2a8948de7717e2e76a1291fc1daf9d1 dmraid-1.0.0.rc13.tar.bz2 170497
-RMD160 9b95d68c2177c3bb7c74227c375780d3b4936ef7 dmraid-1.0.0.rc13.tar.bz2 170497
-SHA256 8497196528d50203053de0f733917b1d85aae416d2136c695a07aee5632b12b9 dmraid-1.0.0.rc13.tar.bz2 170497
-MD5 d774d4412bfb80d12cf3a4fdfd59de5a e2fsprogs-1.38.tar.gz 3621193
-RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c e2fsprogs-1.38.tar.gz 3621193
-SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7 e2fsprogs-1.38.tar.gz 3621193
-MD5 d62c9bf65546a24d1ec550b820e6f1f1 genkernel-3.4.7.tar.bz2 177129
-RMD160 02600273d157ac00bc930770f44161d402b6e21e genkernel-3.4.7.tar.bz2 177129
-SHA256 c00260e6eda097be4b083ba61b9ac14056ae86236449067044ab8ad4d7c14560 genkernel-3.4.7.tar.bz2 177129
-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/genkernel-3.4.6.ebuild b/sys-kernel/genkernel/genkernel-3.4.6.ebuild
deleted file mode 100644
index 50c9c53578cb..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.6.ebuild
+++ /dev/null
@@ -1,101 +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.6.ebuild,v 1.3 2007/02/02 22:52:46 wolf31o2 Exp $
-
-inherit bash-completion eutils
-
-VERSION_DMAP='1.02.07'
-VERSION_DMRAID='1.0.0.rc13'
-VERSION_E2FSPROGS='1.38'
-VERSION_LVM2='2.02.05'
-VERSION_PKG='3.4'
-VERSION_SUSPEND='0.5'
-VERSION_UNIONFS='1.4'
-
-DESCRIPTION="Gentoo autokernel script"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/genkernel/${P}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/genkernel/genkernel-pkg-${VERSION_PKG}.tar.bz2
-	http://people.redhat.com/~heinzm/sw/dmraid/src/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-${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.7.ebuild b/sys-kernel/genkernel/genkernel-3.4.7.ebuild
deleted file mode 100644
index 2a9c6899880b..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.7.ebuild
+++ /dev/null
@@ -1,103 +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.7.ebuild,v 1.1 2007/04/05 15:01:33 wolf31o2 Exp $
-
-inherit bash-completion eutils
-
-VERSION_DMAP='1.02.07'
-VERSION_DMRAID='1.0.0.rc13'
-VERSION_E2FSPROGS='1.38'
-VERSION_LVM2='2.02.05'
-VERSION_PKG='3.4-r1'
-VERSION_SUSPEND='0.5'
-VERSION_UNIONFS='1.5pre-cvs200701042308'
-
-DESCRIPTION="Gentoo autokernel script"
-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/sources/${PN}/${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
-	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.8.ebuild b/sys-kernel/genkernel/genkernel-3.4.8.ebuild
index 8d30414cc4bb..2c31d117b17c 100644
--- a/sys-kernel/genkernel/genkernel-3.4.8.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.8.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.8.ebuild,v 1.2 2007/07/24 19:46:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.8.ebuild,v 1.3 2007/08/22 02:19:49 wolf31o2 Exp $
 
 inherit bash-completion eutils
 
@@ -19,6 +19,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${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