Removed older versions. Marked 3.4.5-r1 stable. Added 3.4.6 which fixes the following bugs: #146466, #146714, #149020, #156410, #156445, #156611, #156640, #157538, #157777, #158017, #158135, #158776. I am planning on using 3.4.6 or higher for 2007.0, so it is on the fast track to stable.

Package-Manager: portage-2.1.2_rc4-r1

5 files changed, 196 insertions, 6 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index d641724ca018..a9e34ac97247 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,17 @@
 # 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.158 2006/11/22 17:33:51 agriffis Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.159 2007/01/04 17:53:37 wolf31o2 Exp $
+
+*genkernel-3.4.6 (04 Jan 2007)
+
+  04 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/suspend-0.5-Makefile.patch, -genkernel-3.4.1.ebuild,
+  -genkernel-3.4.4.ebuild, -genkernel-3.4.5.ebuild,
+  genkernel-3.4.5-r1.ebuild, +genkernel-3.4.6.ebuild:
+  Removed older versions. Marked 3.4.5-r1 stable. Added 3.4.6 which fixes the
+  following bugs: #146466, #146714, #149020, #156410, #156445, #156611,
+  #156640, #157538, #157777, #158017, #158135, #158776. I am planning on using
+  3.4.6 or higher for 2007.0, so it is on the fast track to stable.
 
 *genkernel-3.4.5-r1 (22 Nov 2006)
 
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.6 b/sys-kernel/genkernel/files/digest-genkernel-3.4.6
new file mode 100644
index 000000000000..97731bb39f06
--- /dev/null
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.4.6
@@ -0,0 +1,24 @@
+MD5 87d8615a655b9a6c1a0e234eab2485bf LVM2.2.02.05.tgz 473621
+RMD160 7295f14e64dc25035d46e3512db6cae1b2be5f9b LVM2.2.02.05.tgz 473621
+SHA256 707c596c7a2f11cc08d3b1099995be2a4a3859a5454ed5af1a6c5361a821a402 LVM2.2.02.05.tgz 473621
+MD5 460cc211b03af4048ec90c0de2ecd8f7 device-mapper.1.02.07.tgz 923923
+RMD160 517dd7bde6935235f8c22149ef6e0cb80e6c925b device-mapper.1.02.07.tgz 923923
+SHA256 1e9c16e8f7bcf87bec03103dda63c0d11cdc739f432488b026b4614fd3cabf40 device-mapper.1.02.07.tgz 923923
+MD5 a2a8948de7717e2e76a1291fc1daf9d1 dmraid-1.0.0.rc13.tar.bz2 170497
+RMD160 9b95d68c2177c3bb7c74227c375780d3b4936ef7 dmraid-1.0.0.rc13.tar.bz2 170497
+SHA256 8497196528d50203053de0f733917b1d85aae416d2136c695a07aee5632b12b9 dmraid-1.0.0.rc13.tar.bz2 170497
+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 e13d5b1d732ddc8541cea0f84f82e265 genkernel-3.4.6.tar.bz2 169270
+RMD160 5d38aeebaab78e55cb49a8dbd63504fae5b8d5be genkernel-3.4.6.tar.bz2 169270
+SHA256 e1d56d8d16e67181777281d479ed2d323586cc971226f2c7d716a409ac5da0bf genkernel-3.4.6.tar.bz2 169270
+MD5 2fa8384b099d53f878a1f8ef49214493 genkernel-pkg-3.4.tar.bz2 1848904
+RMD160 09e1baed7e3703b2f6c304656a81a12ba4594083 genkernel-pkg-3.4.tar.bz2 1848904
+SHA256 2345a16a3b377e3ffde2f0cca7e82cf3566e03e8bb2098db69210f505a989af3 genkernel-pkg-3.4.tar.bz2 1848904
+MD5 c0a89e47eeaf14ec68f9114f74b16d09 suspend-0.5.tar.gz 163148
+RMD160 8b38fcb18c7f860b4c292a4329f268bce6dc177a suspend-0.5.tar.gz 163148
+SHA256 ab87f1ee097dab98b4d56f98c95779a47a859de81512292743213e6bd5a352f1 suspend-0.5.tar.gz 163148
+MD5 38ed4d9e41c20cf398018928d2c62700 unionfs-1.4.tar.gz 164696
+RMD160 5a19ccfd6edf25f55c48ba1b820347572353c7ba unionfs-1.4.tar.gz 164696
+SHA256 3ff105782aba722b1f263e408fac638245d302a9c8d0f37ac09e5a80caf0126b unionfs-1.4.tar.gz 164696
diff --git a/sys-kernel/genkernel/files/suspend-0.5-Makefile.patch b/sys-kernel/genkernel/files/suspend-0.5-Makefile.patch
new file mode 100644
index 000000000000..d74a10cffe00
--- /dev/null
+++ b/sys-kernel/genkernel/files/suspend-0.5-Makefile.patch
@@ -0,0 +1,56 @@
+
+From: Daniel Drake <ddrake@brontes3d.com>
+
+Index: suspend-0.5/Makefile
+===================================================================
+--- suspend-0.5.orig/Makefile
++++ suspend-0.5/Makefile
+@@ -1,14 +1,14 @@
+ #CONFIG_COMPRESS=yes
+ #CONFIG_ENCRYPT=yes
+ #CONFIG_SPLASHY=yes
+-#CONFIG_UDEV=yes
++CONFIG_UDEV=yes
+ 
+ ARCH:=$(shell uname -m)
+ 
+-CC_FLAGS=-I/usr/local/include
+-LD_FLAGS=-L/usr/local/lib
++CC_FLAGS?=-I/usr/local/include
++LD_FLAGS?=-L/usr/local/lib
+ 
+-CFLAGS := -O2 -Wall
++CFLAGS ?= -O2 -Wall
+ 
+ ifdef CONFIG_COMPRESS
+ CC_FLAGS	+= -DCONFIG_COMPRESS
+@@ -22,7 +22,7 @@ CC_FLAGS	+= $(GCRYPT_CC_FLAGS)
+ LD_FLAGS	+= $(GCRYPT_LD_FLAGS)
+ endif
+ 
+-SUSPEND_DIR=/usr/local/sbin
++SUSPEND_DIR?=/usr/local/sbin
+ CONFIG_DIR=/etc
+ RESUME_DEVICE=<path_to_resume_device_file>
+ BOOT_DIR=/boot
+@@ -31,7 +31,7 @@ S2BOTH=s2both
+ S2DISK=s2disk
+ CONFIGFILE=suspend.conf
+ 
+-ifndef CONFIG_UDEV
++ifneq ($(CONFIG_UDEV), yes)
+ SNAPSHOT=$(DESTDIR)/dev/snapshot
+ endif
+ 
+@@ -145,9 +145,9 @@ install-s2disk: $(S2DISK) swap-offset co
+ 	if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR); fi
+ 
+ install: $(S2DISK) $(S2BOTH) swap-offset conf/$(CONFIGFILE) $(SNAPSHOT)
+-	install --mode=755 $(S2DISK) $(DESTDIR)$(SUSPEND_DIR)
++	install -D --mode=755 $(S2DISK) $(DESTDIR)$(SUSPEND_DIR)/$(S2DISK)
+ 	install --mode=755 $(S2BOTH) $(DESTDIR)$(SUSPEND_DIR)
+-	if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR); fi
++	if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install -D --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE); fi
+ 	install --mode=755 s2ram $(DESTDIR)$(SUSPEND_DIR)
+ 	install --mode=755 resume $(DESTDIR)$(SUSPEND_DIR)
+ 	install --mode=755 swap-offset $(DESTDIR)$(SUSPEND_DIR)
diff --git a/sys-kernel/genkernel/genkernel-3.4.5-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.5-r1.ebuild
index ec0ded5a5d7e..2c04ab71fbc9 100644
--- a/sys-kernel/genkernel/genkernel-3.4.5-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.5-r1.ebuild,v 1.1 2006/11/22 17:33:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.5-r1.ebuild,v 1.2 2007/01/04 17:53:37 wolf31o2 Exp $
 
 inherit bash-completion eutils
 
@@ -23,8 +23,8 @@ SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/genkernel/${P}.tar.bz2
 
 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"
+#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"
diff --git a/sys-kernel/genkernel/genkernel-3.4.6.ebuild b/sys-kernel/genkernel/genkernel-3.4.6.ebuild
new file mode 100644
index 000000000000..a25e07633186
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.6.ebuild,v 1.1 2007/01/04 17:53:37 wolf31o2 Exp $
+
+inherit bash-completion eutils
+
+VERSION_DMAP='1.02.07'
+VERSION_DMRAID='1.0.0.rc13'
+VERSION_E2FSPROGS='1.38'
+VERSION_LVM2='2.02.05'
+VERSION_PKG='3.4'
+VERSION_SUSPEND='0.5'
+VERSION_UNIONFS='1.4'
+
+DESCRIPTION="Gentoo autokernel script"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/genkernel/${P}.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/sources/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
+	mirror://sourceforge/suspend/suspend-${VERSION_SUSPEND}.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 selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd "${S}"
+	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
+	cp ${FILESDIR}/suspend-0.5-Makefile.patch pkg
+	use selinux && sed -i 's/###//g' gen_compile.sh
+}
+
+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:" \
+		-e "s:VERSION_SUSPEND:$VERSION_SUSPEND:" \
+		${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 \
+	"${DISTDIR}"/suspend-${VERSION_SUSPEND}.tar.gz \
+	${D}/usr/share/genkernel/pkg
+
+	dobashcompletion ${FILESDIR}/genkernel.bash
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog '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
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+
+	bash-completion_pkg_postinst
+}