Fix #73158, #77377, #88682, #88988, #94680. Masked until we know this all works right.

Package-Manager: portage-2.0.51.22

4 files changed, 82 insertions, 24 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 412d9ade060f..bfc357237e07 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.79 2005/05/11 13:55:37 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.80 2005/06/03 19:07:37 plasmaroo Exp $
+
+*genkernel-3.2.0_pre2 (03 Jun 2005)
+
+  03 Jun 2005; <plasmaroo@gentoo.org> +genkernel-3.2.0_pre2.ebuild:
+  Fix #73158, #77377, #88682, #88988, #94680. Masked until we know this all
+  works right.
 
 *genkernel-2.1 (11 May 2005)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 0ffcad727b66..b9f577170612 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 456b8cb28883b6bb42391a74da131716 genkernel-1.6.ebuild 566
+MD5 9f19cacd62406d30f2ef579079f9ee12 genkernel-3.1.6.ebuild 1763
+MD5 8e2bd886964334b1304c7cb35bb32747 ChangeLog 13587
 MD5 697bdc27694bc88ad6d20ed2b7041008 genkernel-1.8.ebuild 663
+MD5 40936e9063143ed6e5c22c8c29a8f013 genkernel-3.0.1.ebuild 765
+MD5 e57f94c747921d4b9bf284b54e8bde3d metadata.xml 228
+MD5 456b8cb28883b6bb42391a74da131716 genkernel-1.6.ebuild 566
+MD5 584598ae9319861ffbf307c8bee1ba46 genkernel-3.1.0c.ebuild 924
 MD5 92456af73fe98b8f5149cabd7bc34ef6 genkernel-3.0.2.ebuild 812
+MD5 864cdca957e5444d526e79e9d4471238 genkernel-1.9.ebuild 680
 MD5 74381f807e720cfdc9d9d66907d94da9 genkernel-3.1.5.ebuild 1639
 MD5 16493f6508efda66e490ce8efb8f49b7 genkernel-3.1.1b.ebuild 1646
-MD5 584598ae9319861ffbf307c8bee1ba46 genkernel-3.1.0c.ebuild 924
-MD5 40936e9063143ed6e5c22c8c29a8f013 genkernel-3.0.1.ebuild 765
-MD5 864cdca957e5444d526e79e9d4471238 genkernel-1.9.ebuild 680
-MD5 6f65885cecb8ecec4a0391b9332b6abe ChangeLog 13390
-MD5 e57f94c747921d4b9bf284b54e8bde3d metadata.xml 228
-MD5 9f19cacd62406d30f2ef579079f9ee12 genkernel-3.1.6.ebuild 1763
+MD5 ce613957cb17dee2daffd6e440a9e089 genkernel-3.2.0_pre2.ebuild 1769
+MD5 d51b701acd7b273c3d26c88bf1b320c2 files/digest-genkernel-3.1.5 269
+MD5 2c3259f869e04ff498e4ba16fd7aad6c files/digest-genkernel-3.1.0c 70
+MD5 b4e499b1b118c81ff78b5c5128264933 files/digest-genkernel-3.2.0_pre2 274
 MD5 440e33e8603dd4aad622093a60c7e32e files/digest-genkernel-1.6 66
-MD5 85c20772dc52cc678fad96d09ebc44e2 files/digest-genkernel-1.8 66
-MD5 291fa3228fe4c8ef8f5d3a820984be53 files/digest-genkernel-1.9 66
 MD5 9a17266ead735f39098dc393745e6d88 files/digest-genkernel-3.0.1 69
+MD5 291fa3228fe4c8ef8f5d3a820984be53 files/digest-genkernel-1.9 66
+MD5 dd2611bb1ae0689fbbb0ecdbca6e0cec files/bin-keymaps.tar.gz 17054
+MD5 85c20772dc52cc678fad96d09ebc44e2 files/digest-genkernel-1.8 66
 MD5 98fc638bf0e5dad6ba7e8ad55d416260 files/digest-genkernel-3.0.2 69
-MD5 d51b701acd7b273c3d26c88bf1b320c2 files/digest-genkernel-3.1.5 269
-MD5 4dda22f8c6f55619f9a595b4f68615a9 files/digest-genkernel-3.1.6 269
-MD5 2c3259f869e04ff498e4ba16fd7aad6c files/digest-genkernel-3.1.0c 70
 MD5 5ec6b85eeb6dbc66e07879f057210e23 files/digest-genkernel-3.1.1b 270
-MD5 dd2611bb1ae0689fbbb0ecdbca6e0cec files/bin-keymaps.tar.gz 17054
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCkKhTI1lqEGTUzyQRAryhAKCFBIiBZWHcMAyO0sRF4eg7K/HlBACgwX/Z
-F7TzjZDS6fn0wocARab2mJc=
-=ms54
------END PGP SIGNATURE-----
+MD5 4dda22f8c6f55619f9a595b4f68615a9 files/digest-genkernel-3.1.6 269
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre2 b/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre2
new file mode 100644
index 000000000000..bb4047b3d8e4
--- /dev/null
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre2
@@ -0,0 +1,4 @@
+MD5 756ecffb8311ef21f3eda119666af837 genkernel-3.2.0_pre2.tar.bz2 2053838
+MD5 8383b009ac61674fae6de442c6dba910 dmraid-1.0.0.rc6.tar.bz2 126327
+MD5 287ed36505eca25ceda7c48c3dfed42c LVM2.2.00.25.tgz 427445
+MD5 b74bb5fa232c77bf74f87eac2f53e1e4 device-mapper.1.00.17.tgz 637694
diff --git a/sys-kernel/genkernel/genkernel-3.2.0_pre2.ebuild b/sys-kernel/genkernel/genkernel-3.2.0_pre2.ebuild
new file mode 100644
index 000000000000..2cabf6d0f4d0
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.2.0_pre2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.2.0_pre2.ebuild,v 1.1 2005/06/03 19:07:37 plasmaroo Exp $
+
+VERSION_DMAP='1.00.17'
+VERSION_DMRAID='1.0.0.rc6'
+VERSION_LVM2='2.00.25'
+
+DESCRIPTION="Gentoo autokernel script"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~plasmaroo/patches/kernel/genkernel/${P}.tar.bz2
+	 livecd? ( 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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
+IUSE="bootsplash livecd ibm"
+
+DEPEND="sys-fs/e2fsprogs
+	x86? ( bootsplash? ( media-gfx/bootsplash ) )
+	amd64? ( bootsplash? ( media-gfx/bootsplash ) )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_install() {
+	dodir /etc
+	cp ${S}/genkernel.conf ${D}/etc
+
+	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
+
+	use livecd && cp ${DISTDIR}/dmraid-${VERSION_DMRAID}.tar.bz2 ${DISTDIR}/LVM2.${VERSION_LVM2}.tgz ${DISTDIR}/device-mapper.${VERSION_DMAP}.tgz ${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
+}