sys-kernel/genkernel: 3.4.33

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 174 insertions, 11 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 2708f097ff91..bc60af1bf999 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.304 2012/05/16 19:08:00 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.305 2012/05/17 17:54:17 sping Exp $
+
+*genkernel-3.4.33 (17 May 2012)
+
+  17 May 2012; Sebastian Pipping <sping@gentoo.org> +genkernel-3.4.33.ebuild,
+  genkernel-9999.ebuild:
+  Bump to 3.4.33
 
   16 May 2012; Sebastian Pipping <sping@gentoo.org> -genkernel-3.4.17.ebuild,
   -genkernel-3.4.18.ebuild, -genkernel-3.4.19.ebuild:
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index e1b02f952636..12904af122b2 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -28,6 +28,7 @@ DIST genkernel-3.4.27.tar.bz2 216732 RMD160 388a47c6a698799a724aa05bf6146cb2e1d1
 DIST genkernel-3.4.28.tar.bz2 216884 RMD160 0b16005f732e689dbe847054349a719d6d615bfe SHA1 5650a874cc80740cc3bd6b8b33ba8574463da576 SHA256 cc66a704c456758e5f7b0f8301de22967d0f0efaa6624c51a6774dd112958ec8
 DIST genkernel-3.4.29.tar.bz2 217415 RMD160 2d8645d7fc385075fcea82db7b32bb89931c6c7b SHA1 5ee18fc380221d58a0336aa7fceac6924aaf3002 SHA256 b5608aed09858f98218e7dbbaee0c3a73a4faa05b958b7873de79880d0f6f32d
 DIST genkernel-3.4.32.tar.bz2 211303 RMD160 67d80f4874f4dcb5cccc27b968d45f136c46c9d6 SHA1 7333954918c7bcf9feef07f3da9a036d2d6daf4d SHA256 324e52770af0ca03bfedc129b0fafd41ef58dfc0ed4216562689daea105a9882
+DIST genkernel-3.4.33.tar.bz2 211082 RMD160 51090e6bb2fd87680d16a29cd1540ea23a3060a1 SHA1 65fcf38684b6e57a81ea1ab2e1710a5ea8c2a45b SHA256 b16732a7737ee8d1f410eb835bc3eb154c9ef295ae8b572abed6a16f94100b38
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
 DIST mdadm-3.1.5.tar.bz2 292709 RMD160 e0542c4556988cae551b3399f0f0d27e42b68bda SHA1 e71859f16e1184df2c033a9e24a6f3f262bbf9a5 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3
@@ -48,13 +49,14 @@ EBUILD genkernel-3.4.27.ebuild 5168 RMD160 75611e722a7c990fa6bf0970afc8e14e4856c
 EBUILD genkernel-3.4.28.ebuild 5168 RMD160 eed133f5d2e98b0351ac093a734dca48c2cb9607 SHA1 4cb6de0ff93f13497d05095525fcfd4aa6c9cecc SHA256 2c91b73f32e6db5f17b2a0fa38f4852a05bb9cca16992a535568e2e4728ca473
 EBUILD genkernel-3.4.29.ebuild 5168 RMD160 20708bd148e4753f8b11eda0e72715355c25a42a SHA1 43c33a594d5204da1378e9797ba4e5904596a6ae SHA256 8786e7a0364bd7b172a0aa30444b81d947e0f8abcf9ff778d7037c7b148d0256
 EBUILD genkernel-3.4.32.ebuild 5548 RMD160 f3ae249dd1c8aa272f8542b066eee43762bdb59f SHA1 d000000577068195039587580d00f7b325e5faae SHA256 cea1f7420e2d83bf474c90a3f62f75eff83cbb680fb191fd9478ad75e0181272
-EBUILD genkernel-9999.ebuild 5547 RMD160 87c162c03eaa71f0443dea53da6c2fec7195b997 SHA1 8da679ea0202dde3e243b4c238e8e60f751097ca SHA256 cb17dafe3ce8668dc9754dc7050f5788cff7865e3677d45654925e8cb5e5981c
-MISC ChangeLog 57155 RMD160 59d8096d99f4487b18c0e8f3c3268f31eb082a33 SHA1 35c968f053c6c65b044f8855d633e26eff0c42fb SHA256 0139c53c2d11ab3f53a4667a0cd14c5aa29ca03f22a445f0a4eb99688a48ace0
+EBUILD genkernel-3.4.33.ebuild 5348 RMD160 d063c1f3b0f8d091d56ec70354950f4e40a86a8a SHA1 38d196c4e7682d6c9a05a685b5e032afc62919ea SHA256 c77df4a45e7052b42249a5122a23f8057d78e8c587f11c77a1cfdc8b2c5019e4
+EBUILD genkernel-9999.ebuild 5347 RMD160 fad9e3b300ccebe78b70c3c380aeecf64b45937b SHA1 738426f6bf5205e4ca10368e2f8fbaeb2d82e966 SHA256 6aa3629d11c144d22e85ac23eb785a56a5b5b591e926015d63e998bb749053d5
+MISC ChangeLog 57309 RMD160 0562b2bac765917af8cdba1f3305411a3eb63f59 SHA1 f827f67cd144ca97a05e5b53103a11d9a1196505 SHA256 0b5e32570321372e7a5563845d39c7c65c1ef5c9d7ddc7fc2ecea8abd405d83d
 MISC metadata.xml 324 RMD160 3527070c43df4e4a7e2f40f941b6d683ae662e84 SHA1 f6707c554d2b72aa2b8e29767a66134b533e2d9a SHA256 c126eb3c7144839781275d68804421eec596e3b82515780c76697ac9e106bcf0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+z+vgACgkQsAvGakAaFgCduwCfQVtXqHhboxcSflBXqgbob3Lw
-QxkAnAkPVVpo0GXtM+v53lFQ4R/Jv0kY
-=MDfm
+iEYEARECAAYFAk+1OzcACgkQsAvGakAaFgAxagCfTrJMhMUJ6eP9pE630075OPNX
+m9AAoKSDGkgMIbJWzuPXgMHMPLcDuyse
+=L/sj
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/genkernel-3.4.33.ebuild b/sys-kernel/genkernel/genkernel-3.4.33.ebuild
new file mode 100644
index 000000000000..4025e1e58b57
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.33.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.33.ebuild,v 1.1 2012/05/17 17:54:17 sping Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="3"
+
+VERSION_BUSYBOX='1.19.3'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+MY_HOME="http://wolf31o2.org"
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		${MY_HOME}/sources/genkernel/${P}.tar.bz2
+		${COMMON_URI}"
+	# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
+	# Release Engineering, it's easier for us to deal with all arches at once.
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="crypt cryptsetup ibm selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+		cryptsetup? ( sys-fs/cryptsetup )
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
+	# This block updates genkernel.conf
+	sed \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
+		|| die "Could not adjust versions"
+	insinto /etc
+	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
+
+	doman genkernel.8 || die "doman"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+	dobin genkernel || die "dobin genkernel"
+
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/* || die "doins"
+	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+		cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
+
+	# Copy files to /var/cache/genkernel/src
+	elog "Copying files to /var/cache/genkernel/src..."
+	mkdir -p "${D}"/var/cache/genkernel/src
+	cp -f \
+		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
+		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
+		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
+		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
+		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
+		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
+		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+}
+
+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
+	if use crypt && ! use cryptsetup ; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index e7a8a2f4a228..d06fe8ab0810 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.35 2012/05/16 18:56:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.36 2012/05/17 17:54:17 sping Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -10,7 +10,6 @@ EAPI="3"
 VERSION_BUSYBOX='1.19.3'
 VERSION_DMRAID='1.0.0.rc16-3'
 VERSION_MDADM='3.1.5'
-VERSION_E2FSPROGS='1.42'
 VERSION_FUSE='2.8.6'
 VERSION_ISCSI='2.0-872'
 VERSION_LVM='2.02.88'
@@ -29,7 +28,6 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
 		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
 		mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz
 		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
 		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
 		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
@@ -94,7 +92,6 @@ src_install() {
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
 		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
 		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
 		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
 		-e "s:VERSION_LVM:$VERSION_LVM:" \
@@ -124,7 +121,6 @@ src_install() {
 		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
 		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
 		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
-		"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
 		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
 		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
 		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \