Fix bug #141153; patch from Pylon.

(Portage version: 2.1.1_pre1-r5)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 114 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 03c4734ea4b8..fc1ce1ef6979 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -8,7 +8,7 @@ DIST genkernel-3.3.11.tar.bz2 142395 RMD160 14e37ec9a38e896ae605a7ad645213103126
 DIST genkernel-3.3.11a.tar.bz2 142491 RMD160 5cb4611a6162a41807836c403574163f3c1943aa SHA1 926886beca73be1bdf118d87b3b54eab569dc43e SHA256 d7463bcf2bc27b55c09eb3975f5e29b2d770cfb8f688dcf019503027406133f0
 DIST genkernel-3.3.11d.tar.bz2 144719 RMD160 c9b9c6f5154991edba40922a31aabfaee892a622 SHA1 d7bb2da2f9bbfc64d2a0ecd75706756400db406c SHA256 05d3b0af3f7532751288dd40dd41a0aa910182e33e8540b26809a43bfa4e0b28
 DIST genkernel-3.4.0_pre2.tar.bz2 146643 RMD160 9ea771d30a454f3a5ed8ba742f863f3682409b14 SHA1 048afb279a3c85e7fa5efadbf1fa103c8c2eb8e1 SHA256 21b9822b012781eeb1cb21e661ef28dd67a2598078f8b3c6a59d6268ad1ebcee
-DIST genkernel-3.4.0_pre3.tar.bz2 146086 RMD160 622d9d2a16af4d957cc291af14bb9f73912b090c SHA1 faf67ef76f707ffa2dcdcef056d814c7b6080024 SHA256 d299a8a4122b6456d9f00018bdda505a908a19fd6e8f70d0380893ed51173163
+DIST genkernel-3.4.0_pre4.tar.bz2 146034 RMD160 2e15c01fba49d3f403046e4ade660bbd70434c8d SHA1 bbce17c8b5441cff0187ab4448011e1330893435 SHA256 659417246249d2bcd9bde83540827ba05dcbca8e48e57379c7bd91c351c73313
 DIST genkernel-pkg-3.3.11.tar.bz2 1535239 RMD160 f18ac2b9ce82fa2f7fcc7eaf15d4d622da01c269 SHA1 dd6af4a89ec8d5d005a092aa6b2e29a78f1112e4 SHA256 c8fe8a88036f42656e301a0730ec19b0fc238972e56277de64b63cf0d42574c4
 DIST genkernel-pkg-3.3.11a.tar.bz2 1535685 RMD160 9e592f45b53098dff4110d66fd51da6d88d9d607 SHA1 21970f00bf888b3c31981bb8bc29f2cb1a9d4583 SHA256 96c7d1cd1422f0cadffe35f9a8785c5ec75cc439c229e74fd08339bc3882fa66
 DIST genkernel-pkg-3.3.9.tar.bz2 1524695 RMD160 abef28f491f3dfa6e7dd49040faf4a7221033e74 SHA1 d5c573790477f04919cd322c37b6055d4b3979b0 SHA256 e720eafb0563fbea7f33f20492f5a9eb00ff617a307e354ac3c4dae60b2d83c4
@@ -39,14 +39,14 @@ EBUILD genkernel-3.4.0_pre2.ebuild 2830 RMD160 336e38e6c885754b69142a256948ea6c6
 MD5 b2ad7c43527a1922ff68a088dc623f14 genkernel-3.4.0_pre2.ebuild 2830
 RMD160 336e38e6c885754b69142a256948ea6c6e6cd61d genkernel-3.4.0_pre2.ebuild 2830
 SHA256 aef8a298a1912307d1ebc5bff20e0b88f8a75308f847733a8f8d4da5192392e8 genkernel-3.4.0_pre2.ebuild 2830
-EBUILD genkernel-3.4.0_pre3.ebuild 2830 RMD160 8998d7b0a1ae58a10e04d66746a677fc20a10194 SHA1 ecabd9c253f0b9b0ab824768da2de8a577d792b5 SHA256 21f85e27c018971b558d278c3d4eb189d1c2a5a1471e99e3c3af85db4d44cbd5
-MD5 9ef90199561df0a5116959ff037c700f genkernel-3.4.0_pre3.ebuild 2830
-RMD160 8998d7b0a1ae58a10e04d66746a677fc20a10194 genkernel-3.4.0_pre3.ebuild 2830
-SHA256 21f85e27c018971b558d278c3d4eb189d1c2a5a1471e99e3c3af85db4d44cbd5 genkernel-3.4.0_pre3.ebuild 2830
-MISC ChangeLog 25577 RMD160 1bb4cb8236e4760afa8fbd6fd76feb5cb785c70e SHA1 44bf2068e99e7670902ed9e4dccf15e8dcc40acc SHA256 d6a47ba75247ba48f9a0def1bd26b556c144899151fb9aa78e68e96bbf0a68f6
-MD5 19fbc46562a5d2bb7fba4fe6e8c67f1f ChangeLog 25577
-RMD160 1bb4cb8236e4760afa8fbd6fd76feb5cb785c70e ChangeLog 25577
-SHA256 d6a47ba75247ba48f9a0def1bd26b556c144899151fb9aa78e68e96bbf0a68f6 ChangeLog 25577
+EBUILD genkernel-3.4.0_pre4.ebuild 2830 RMD160 e86500d5d4b601d1bb9f1c234f75dae59850d595 SHA1 905e0b2152f07ef31000d32281b6f47548d2cf79 SHA256 59745d60ce28a06f82bd7c0174fbc8f4e552dc8524a6f4266b330cfabb72547e
+MD5 085fa44204dfd006d477871b16217cb5 genkernel-3.4.0_pre4.ebuild 2830
+RMD160 e86500d5d4b601d1bb9f1c234f75dae59850d595 genkernel-3.4.0_pre4.ebuild 2830
+SHA256 59745d60ce28a06f82bd7c0174fbc8f4e552dc8524a6f4266b330cfabb72547e genkernel-3.4.0_pre4.ebuild 2830
+MISC ChangeLog 25752 RMD160 16cb172ac6461be2730da7f26ce03410bea1037b SHA1 ac09e405c298d67a5ec91dd2d782c5c31f239d6a SHA256 a68ae8953c0bc66eb671475c6df21de14202dbbee0402633726ff7740b57400c
+MD5 3496025b5189c94f4cf446053100a452 ChangeLog 25752
+RMD160 16cb172ac6461be2730da7f26ce03410bea1037b ChangeLog 25752
+SHA256 a68ae8953c0bc66eb671475c6df21de14202dbbee0402633726ff7740b57400c ChangeLog 25752
 MISC metadata.xml 228 RMD160 9167a380e8c315850ca95f5601454725157ab0fd SHA1 1abd3f6faf9f8c5a8758ee3bdf72a328f84b9428 SHA256 942934f251c7ef8c73ae173a5a4c4064c1ead6032022b49edbae5b84869ab6e6
 MD5 e57f94c747921d4b9bf284b54e8bde3d metadata.xml 228
 RMD160 9167a380e8c315850ca95f5601454725157ab0fd metadata.xml 228
@@ -66,6 +66,6 @@ SHA256 c1905cdaf1a4602fd265b88c4a1655632ca12c0583f0f0cb1ec303f8b943fa0d files/di
 MD5 7c8d9bb9c65822c3acd9e580ee3c6043 files/digest-genkernel-3.4.0_pre2 1774
 RMD160 f578910b9ef70cf084f641edebf531e490e4f64d files/digest-genkernel-3.4.0_pre2 1774
 SHA256 e446125e8fa7c4dca6dd6be46c1b70f98d18f9ac10289be0223508681f22b67b files/digest-genkernel-3.4.0_pre2 1774
-MD5 9c22e51a93bb52a1e5e8528037ef9f67 files/digest-genkernel-3.4.0_pre3 1774
-RMD160 0e4877ccb7ff87644437a93e1089caa09bf7fb5e files/digest-genkernel-3.4.0_pre3 1774
-SHA256 b254609095b1318d6d9690d4c1f5a917217f04edc3a0b00b3cce39a9cf1cac6f files/digest-genkernel-3.4.0_pre3 1774
+MD5 65870f181b47b7f5fac811bb6934c5ff files/digest-genkernel-3.4.0_pre4 1774
+RMD160 a7b2d035c694b40719314c17fc9062a190d3533a files/digest-genkernel-3.4.0_pre4 1774
+SHA256 d54223930d12d70020494d900432517fadff980f601197ab5b0f491363c9ed1c files/digest-genkernel-3.4.0_pre4 1774
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.0_pre3 b/sys-kernel/genkernel/files/digest-genkernel-3.4.0_pre3
deleted file mode 100644
index 8f3f7a5e47b5..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.0_pre3
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 287ed36505eca25ceda7c48c3dfed42c LVM2.2.00.25.tgz 427445
-RMD160 9a43dd3fa3e7d293986b51aaba4e5b7a8ee07977 LVM2.2.00.25.tgz 427445
-SHA256 4f3364edd8958b2a194d78c2c2fbe0c37541a7f2b1ce1bd830f34417cec3738d LVM2.2.00.25.tgz 427445
-MD5 b74bb5fa232c77bf74f87eac2f53e1e4 device-mapper.1.00.17.tgz 637694
-RMD160 890c0c9af98548eae40e2546b2aa378ac521acea device-mapper.1.00.17.tgz 637694
-SHA256 79eacac2ee583fb14171be5be447d59fe62a28bbf847bd63b58c204c95358756 device-mapper.1.00.17.tgz 637694
-MD5 0206f8166bfdc370c4ee8efcb35af111 dmraid-1.0.0.rc10.tar.bz2 155397
-RMD160 d784d02d3c2fe71c717c8625bff44ac056bf1f19 dmraid-1.0.0.rc10.tar.bz2 155397
-SHA256 63ef1aa5c0a295be4bf9549f6a62549dc603e6da7273d331e808eb0b73c93c19 dmraid-1.0.0.rc10.tar.bz2 155397
-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 13b955cdf1b5fb6c42e80be3656b0f1b genkernel-3.4.0_pre3.tar.bz2 146086
-RMD160 622d9d2a16af4d957cc291af14bb9f73912b090c genkernel-3.4.0_pre3.tar.bz2 146086
-SHA256 d299a8a4122b6456d9f00018bdda505a908a19fd6e8f70d0380893ed51173163 genkernel-3.4.0_pre3.tar.bz2 146086
-MD5 2fa8384b099d53f878a1f8ef49214493 genkernel-pkg-3.4.0_pre1.tar.bz2 1848904
-RMD160 09e1baed7e3703b2f6c304656a81a12ba4594083 genkernel-pkg-3.4.0_pre1.tar.bz2 1848904
-SHA256 2345a16a3b377e3ffde2f0cca7e82cf3566e03e8bb2098db69210f505a989af3 genkernel-pkg-3.4.0_pre1.tar.bz2 1848904
-MD5 4b0a5393f6a41a24555c2cd30a689b2c unionfs-1.1.4.tar.gz 152081
-RMD160 cb1e94ee12839fed619c33253c1b24d0da5c7fbb unionfs-1.1.4.tar.gz 152081
-SHA256 bd6111ff6757cf53860f09ddbce7a87dd7f495541e4e1aada4576970687e0af9 unionfs-1.1.4.tar.gz 152081
diff --git a/sys-kernel/genkernel/genkernel-3.4.0_pre3.ebuild b/sys-kernel/genkernel/genkernel-3.4.0_pre3.ebuild
deleted file mode 100644
index 1b48cb993c2a..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.0_pre3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.0_pre3.ebuild,v 1.1 2006/07/18 22:36:08 plasmaroo Exp $
-
-VERSION_DMAP='1.00.17'
-VERSION_DMRAID='1.0.0.rc10'
-VERSION_E2FSPROGS='1.38'
-VERSION_LVM2='2.00.25'
-VERSION_PKG='3.4.0_pre1'
-VERSION_UNIONFS='1.1.4'
-
-DESCRIPTION="Gentoo autokernel script"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="http://dev.gentoo.org/~plasmaroo/patches/kernel/genkernel/${P}.tar.bz2
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/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"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-
-DEPEND="sys-fs/e2fsprogs"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
-}
-
-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
-}
-
-pkg_postinst() {
-	echo
-	einfo 'Documentation is available in the genkernel manual page'
-	einfo 'as well as the following URL:'
-	echo
-	einfo '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
-}