Fix bug #141153; patch from Pylon.

(Portage version: 2.1.1_pre1-r5)

3 files changed, 109 insertions, 1 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 032d37a8c0bc..e5aaa26d3578 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.142 2006/07/18 22:36:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.143 2006/07/20 22:05:42 plasmaroo Exp $
+
+*genkernel-3.4.0_pre4 (20 Jul 2006)
+
+  20 Jul 2006; <plasmaroo@gentoo.org> -genkernel-3.4.0_pre3.ebuild,
+  +genkernel-3.4.0_pre4.ebuild:
+  Fix bug #141153; patch from Pylon.
 
 *genkernel-3.4.0_pre3 (18 Jul 2006)
 
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.0_pre4 b/sys-kernel/genkernel/files/digest-genkernel-3.4.0_pre4
new file mode 100644
index 000000000000..808b70f6452e
--- /dev/null
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.4.0_pre4
@@ -0,0 +1,21 @@
+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 456ccae2bffb6af76a8cbebb451aa285 genkernel-3.4.0_pre4.tar.bz2 146034
+RMD160 2e15c01fba49d3f403046e4ade660bbd70434c8d genkernel-3.4.0_pre4.tar.bz2 146034
+SHA256 659417246249d2bcd9bde83540827ba05dcbca8e48e57379c7bd91c351c73313 genkernel-3.4.0_pre4.tar.bz2 146034
+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_pre4.ebuild b/sys-kernel/genkernel/genkernel-3.4.0_pre4.ebuild
new file mode 100644
index 000000000000..02557bc8fe87
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.0_pre4.ebuild
@@ -0,0 +1,81 @@
+# 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_pre4.ebuild,v 1.1 2006/07/20 22:05:42 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
+}