Fix 2.4 module compilation, add livecd USE support for fetching LVM2 and DMRAID source into /usr/share/genkernel/pkg.

Package-Manager: portage-2.0.51.16

5 files changed, 28 insertions, 8 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 4bc53d05c460..36515576533a 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,13 @@
 # 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.71 2005/02/27 00:45:26 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.72 2005/02/28 18:32:41 plasmaroo Exp $
+
+*genkernel-3.1.1 (28 Feb 2005)
+
+  28 Feb 2005; <plasmaroo@gentoo.org> -genkernel-3.1.0l.ebuild,
+  +genkernel-3.1.1.ebuild:
+  Fix 2.4 module compilation, add livecd USE support for fetching LVM2 and
+  DMRAID source into /usr/share/genkernel/pkg.
 
 *genkernel-3.1.0l (27 Feb 2005)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 76b420d201cb..777f5e6ba5a1 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,5 +1,6 @@
-MD5 7052aebd5588c36ab433afd5d4715007 ChangeLog 12260
+MD5 d37472b8e09282d2050cba1d1e45433f ChangeLog 12506
 MD5 697bdc27694bc88ad6d20ed2b7041008 genkernel-1.8.ebuild 663
+MD5 48b86a3d6f84e35ec3181436e0be453b genkernel-3.1.1.ebuild 1503
 MD5 1276ab96d4127d4fd0ea6d67244083bd genkernel-2.1.ebuild 1006
 MD5 40936e9063143ed6e5c22c8c29a8f013 genkernel-3.0.1.ebuild 765
 MD5 e57f94c747921d4b9bf284b54e8bde3d metadata.xml 228
@@ -8,12 +9,11 @@ MD5 584598ae9319861ffbf307c8bee1ba46 genkernel-3.1.0c.ebuild 924
 MD5 92456af73fe98b8f5149cabd7bc34ef6 genkernel-3.0.2.ebuild 812
 MD5 864cdca957e5444d526e79e9d4471238 genkernel-1.9.ebuild 680
 MD5 5c9bdc9dcc15d62196e7c0c03bc8c286 genkernel-2.0.ebuild 994
-MD5 9bda5e7b59cccaf3aa6c5ff640171a11 genkernel-3.1.0l.ebuild 1119
 MD5 2c3259f869e04ff498e4ba16fd7aad6c files/digest-genkernel-3.1.0c 70
 MD5 ac5aa968fb16a108a6536efc2fe94621 files/digest-genkernel-2.1 200
 MD5 1f19fad2f303865b8a247dcdac81fe02 files/digest-genkernel-2.0 195
 MD5 440e33e8603dd4aad622093a60c7e32e files/digest-genkernel-1.6 66
-MD5 d32117145eecf5c624ea366ea3a0a0e0 files/digest-genkernel-3.1.0l 70
+MD5 3b7affd62b2cd7dfe4b9de715407c2b8 files/digest-genkernel-3.1.1 200
 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
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.1.0l b/sys-kernel/genkernel/files/digest-genkernel-3.1.0l
deleted file mode 100644
index 7848ae8a147b..000000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.1.0l
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8aad2d91bb5fb68dfbb31ac284aeb4e4 genkernel-3.1.0l.tar.bz2 2561421
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.1.1 b/sys-kernel/genkernel/files/digest-genkernel-3.1.1
new file mode 100644
index 000000000000..d51d96b973ba
--- /dev/null
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.1.1
@@ -0,0 +1,3 @@
+MD5 871c6c46c37f1de6eeffbfa29bfccd0d genkernel-3.1.1.tar.bz2 2561610
+MD5 086fc75133a0fb0ffe95bd9a7fb8a52f dmraid-1.0.0-rc5f.tar.bz2 122868
+MD5 287ed36505eca25ceda7c48c3dfed42c LVM2.2.00.25.tgz 427445
diff --git a/sys-kernel/genkernel/genkernel-3.1.0l.ebuild b/sys-kernel/genkernel/genkernel-3.1.1.ebuild
index d810071b4d00..5ae04f5522e8 100644
--- a/sys-kernel/genkernel/genkernel-3.1.0l.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.1.1.ebuild
@@ -1,20 +1,29 @@
 # 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.1.0l.ebuild,v 1.1 2005/02/27 00:45:26 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.1.1.ebuild,v 1.1 2005/02/28 18:32:41 plasmaroo Exp $
+
+VERSION_DMRAID='1.0.0-rc5f'
+VERSION_LVM2='2.00.25'
 
 DESCRIPTION="Gentoo autokernel script"
 HOMEPAGE="http://www.gentoo.org"
-SRC_URI="http://dev.gentoo.org/~plasmaroo/patches/kernel/genkernel/3.1.0/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~plasmaroo/patches/kernel/genkernel/3.1.1/${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)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="bootsplash"
+IUSE="bootsplash livecd"
 
 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
@@ -30,6 +39,8 @@ src_install() {
 
 	doman genkernel.8
 	rm genkernel.8
+
+	use livecd && cp ${DISTDIR}/dmraid-${VERSION_DMRAID}.tar.bz2 ${DISTDIR}/LVM2.${VERSION_LVM2}.tgz ${D}/usr/share/genkernel/pkg
 }
 
 pkg_postinst() {