Fix #76082, #86487, #87673, #95993.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 18 insertions, 12 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 0c2524ca7f97..4cba23fb1c70 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.88 2005/06/20 19:12:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.89 2005/06/22 16:40:59 plasmaroo Exp $
+
+*genkernel-3.2.0_pre10 (22 Jun 2005)
+
+  22 Jun 2005; <plasmaroo@gentoo.org> +genkernel-3.2.0_pre10.ebuild,
+  -genkernel-3.2.0_pre9.ebuild:
+  Fix #76082, #86487, #87673, #95993.
 
 *genkernel-3.2.0_pre9 (20 Jun 2005)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 92567db3090d..8126b981fd5c 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,11 +1,11 @@
 MD5 9f19cacd62406d30f2ef579079f9ee12 genkernel-3.1.6.ebuild 1763
-MD5 a7c10d6b7cbf078b3db06ec12df2ac10 ChangeLog 15303
+MD5 2c701f1d01ff780012329bbcaed94fb7 ChangeLog 15481
 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 42374bed5f3507ca88f4cc0d212cb15f genkernel-3.2.0_pre10.ebuild 1880
 MD5 584598ae9319861ffbf307c8bee1ba46 genkernel-3.1.0c.ebuild 924
-MD5 e53c5ffde12d4f3ac96ae689880188f5 genkernel-3.2.0_pre9.ebuild 1918
 MD5 92456af73fe98b8f5149cabd7bc34ef6 genkernel-3.0.2.ebuild 812
 MD5 864cdca957e5444d526e79e9d4471238 genkernel-1.9.ebuild 680
 MD5 74381f807e720cfdc9d9d66907d94da9 genkernel-3.1.5.ebuild 1639
@@ -18,6 +18,6 @@ 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 334ead189b9767d58b62fd0cf1056309 files/digest-genkernel-3.2.0_pre10 342
 MD5 5ec6b85eeb6dbc66e07879f057210e23 files/digest-genkernel-3.1.1b 270
 MD5 4dda22f8c6f55619f9a595b4f68615a9 files/digest-genkernel-3.1.6 269
-MD5 dfa1e98082e5f2e18a717e4fad88bcb1 files/digest-genkernel-3.2.0_pre9 341
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre9 b/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre10
index a980067145b2..104559777924 100644
--- a/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre9
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.2.0_pre10
@@ -1,4 +1,4 @@
-MD5 4500d3c4f38f726f85f305a977026d8a genkernel-3.2.0_pre9.tar.bz2 2060975
+MD5 2b3d13ad50c53c76ffd0a514663a5b31 genkernel-3.2.0_pre10.tar.bz2 2063146
 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_pre9.ebuild b/sys-kernel/genkernel/genkernel-3.2.0_pre10.ebuild
index b1afabd2373e..bacb2b2f2af0 100644
--- a/sys-kernel/genkernel/genkernel-3.2.0_pre9.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.2.0_pre10.ebuild
@@ -1,6 +1,6 @@
 # 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_pre9.ebuild,v 1.1 2005/06/20 19:12:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.2.0_pre10.ebuild,v 1.1 2005/06/22 16:40:59 plasmaroo Exp $
 
 VERSION_DMAP='1.00.17'
 VERSION_DMRAID='1.0.0.rc6'
@@ -10,15 +10,15 @@ VERSION_UNIONFS='1.0.12a'
 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
-		  ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-${VERSION_UNIONFS}.tar.gz )"
+	 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"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="bootsplash livecd ibm"
+IUSE="bootsplash ibm"
 
 DEPEND="sys-fs/e2fsprogs
 	x86? ( bootsplash? ( media-gfx/bootsplash ) )
@@ -45,7 +45,7 @@ src_install() {
 	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 ${DISTDIR}/unionfs-${VERSION_UNIONFS}.tar.gz ${D}/usr/share/genkernel/pkg
+	cp ${DISTDIR}/dmraid-${VERSION_DMRAID}.tar.bz2 ${DISTDIR}/LVM2.${VERSION_LVM2}.tgz ${DISTDIR}/device-mapper.${VERSION_DMAP}.tgz ${DISTDIR}/unionfs-${VERSION_UNIONFS}.tar.gz ${D}/usr/share/genkernel/pkg
 }
 
 pkg_postinst() {