Bump to 3.4.11

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

4 files changed, 165 insertions, 8 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 40c778550998..3be833ae4a53 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.230 2011/01/15 23:59:50 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.231 2011/01/16 21:11:14 sping Exp $
+
+*genkernel-3.4.11 (16 Jan 2011)
+
+  16 Jan 2011; Sebastian Pipping <sping@gentoo.org> +genkernel-3.4.11.ebuild,
+  genkernel-9999.ebuild:
+  Bump to 3.4.11, sync 9999 (four nines) live ebuild
 
   15 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel-99999.ebuild:
   Bump LVM to 2.02.74
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 4ab260411de0..f0b259092fed 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -14,6 +14,7 @@ DIST genkernel-3.4.10.906.tar.bz2 200861 RMD160 87d1474c2b32d3f0afc75c3dfd390edc
 DIST genkernel-3.4.10.907.tar.bz2 202413 RMD160 81ea32bb0b91ed7114bd825b7339132214abc2df SHA1 f2f2ab0658283e3a17caaa3fcc93ddf619e04afa SHA256 0fe4bd273d3ab9fe87e12fbf65b41edafc05cce95e0412e3f5450a0ca6010f12
 DIST genkernel-3.4.10.908.tar.bz2 234577 RMD160 88ee38758d79c9786a4601e957ecee2d0cf085d4 SHA1 172245705dd4673e58ed713bd258919d0a84b7ac SHA256 97e0efcd3ec66087758da6b540e7f497f9f8d9462882d1d99bd4eb7796cb42cd
 DIST genkernel-3.4.10.tar.bz2 210822 RMD160 19327712c7140336db08a466a19f164df11eac7a SHA1 a672b1b81c6b607533f2576f4bf3adaf620f9f54 SHA256 43e7ae3495e5f8e4ead919b059444bfa393bf83d36c14390206892f82ad37685
+DIST genkernel-3.4.11.tar.bz2 248195 RMD160 eb7b4b28cbf4cdfd686af48a0cf1fd5159c36c9f SHA1 a76d184159586e84bc6fe18862f2dd8af7bd89e2 SHA256 1687f501df1d7577dabea6fe30fefe8e1e51fc9fcddbce1bd66cd119959971b3
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
 DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
 DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f6488 SHA1 e95799923ee3938e1fb44c6fd9aa7154d720063e SHA256 fa0c494a8ce63f235601fcc35e3a96527831169d6d5921ee49faccf3b25feb78
@@ -23,7 +24,8 @@ EBUILD genkernel-3.4.10.906.ebuild 4618 RMD160 67df63ffca231d2c1f66c0cf37b94e5f3
 EBUILD genkernel-3.4.10.907-r1.ebuild 5045 RMD160 303cbb92c3e98b29fed9b9ea5016a3e1028da235 SHA1 6c4bedf63b6e1f4291967fb45e2f58c88aa68c31 SHA256 16171f5f55c96c178179bdaac48518f0af158ebd464fa0f48014085157882ee7
 EBUILD genkernel-3.4.10.907.ebuild 4830 RMD160 2f031f6e3e76a5fd907dfc76ba04eab3fb5bdac1 SHA1 4c4cb2358e3e391428e4e42460e3057b14c80e6b SHA256 530c4b62a8f4527a1d9742af3daafd65ef84ca44924002626535b4591793df4f
 EBUILD genkernel-3.4.10.908.ebuild 4822 RMD160 d8a0a273999bbd027d6aebf05aba54e1b76117d9 SHA1 519db4f2861a6cb76ed840d0e1e61093a204b2ef SHA256 f7b400bf55b1cfec29daefd8e0f026526b6470e34e4e4dde2edc9d3623862949
-EBUILD genkernel-9999.ebuild 4817 RMD160 522ce430cb903906419ed95fc85587f0b1e0c365 SHA1 dd669a3f7dff8f88d1ee8a33f5b1fa69c6913b18 SHA256 8272cf1cb9518d54b42785f358eb2aa74ba44a10bfc4b46c265258798c4760df
+EBUILD genkernel-3.4.11.ebuild 4976 RMD160 2cb1a5c5d7f118d210ff6113e6acba060e8cc0cf SHA1 2c0ac6575bd27eccc32e713583e8dcde091a3b52 SHA256 c60b7e1ebc1aab6f293a5976df72a40bc8a650a6fd5e464943d27ca808a10e20
+EBUILD genkernel-9999.ebuild 4975 RMD160 d2be437f78e65f98955c1d30e9081074fc4bcbb5 SHA1 d11c25672e9623f24f350a8c21838de989e705da SHA256 01f740c34c2d67c8bbef060bca668375c02e0ed298f8c77f5ce5e89cfce4e570
 EBUILD genkernel-99999.ebuild 4975 RMD160 2f01c5b60e160791f99d6917dd585dcc3f17eb4b SHA1 6d7933ff7f5d0f8c5aba74574878b8b52ea7bc9e SHA256 35cb818f92c56b6de52735a052b331fa7d7ef40453efdd8c093daa095f3acfcc
-MISC ChangeLog 43905 RMD160 c00a368b3c9e7fdb6c2d34b3f6261f1549f9b986 SHA1 d9049d7f445cad5401c3d2cc7f1318ac3a3f44e6 SHA256 f31da2aa514f8a183b9888d5500fa06cb43ec4d7fdb74bb6a66d41e724e26c3d
+MISC ChangeLog 44095 RMD160 013c05e71d08b8d1f25e02581ed0c3b0c54a0013 SHA1 1b6c8b53f7b467a53d7366846088e9b2d8495c39 SHA256 e1241d94141bf5d46ee3dcd7dff2fa68c2b37f51b538f12c5d8faa9d036ef37c
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
diff --git a/sys-kernel/genkernel/genkernel-3.4.11.ebuild b/sys-kernel/genkernel/genkernel-3.4.11.ebuild
new file mode 100644
index 000000000000..fc8a697699bf
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.11.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.ebuild,v 1.1 2011/01/16 21:11:14 sping Exp $
+
+# genkernel-9999        -> latest Git master
+# genkernel-99999       -> latest Git experimental
+# genkernel-VERSION     -> normal genkernel release
+
+VERSION_BUSYBOX='1.18.1'
+VERSION_DMAP='1.02.22'
+VERSION_DMRAID='1.0.0.rc14'
+VERSION_E2FSPROGS='1.41.14'
+VERSION_FUSE='2.7.4'
+VERSION_ISCSI='2.0-871'
+VERSION_LVM='2.02.74'
+VERSION_UNIONFS_FUSE='0.22'
+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
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz
+		${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/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"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/genkernel.git"
+	[[ ${PV} == 99999* ]] && EGIT_BRANCH=experimental
+	inherit git bash-completion eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion 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="ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+}
+
+src_install() {
+	# This block updates genkernel.conf
+	sed \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_DMAP:$VERSION_DMAP:" \
+		-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:" \
+		-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}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+		"${DISTDIR}"/device-mapper.${VERSION_DMAP}.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 \
+		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
+		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
+		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+	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
+}
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index ac0faea20cc8..d35a665478e0 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2011 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.20 2011/01/07 16:20:57 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.21 2011/01/16 21:11:14 sping Exp $
 
 # genkernel-9999        -> latest Git master
 # genkernel-99999       -> latest Git experimental
 # genkernel-VERSION     -> normal genkernel release
 
-VERSION_BUSYBOX='1.7.4'
+VERSION_BUSYBOX='1.18.1'
 VERSION_DMAP='1.02.22'
 VERSION_DMRAID='1.0.0.rc14'
-VERSION_E2FSPROGS='1.40.9'
+VERSION_E2FSPROGS='1.41.14'
 VERSION_FUSE='2.7.4'
 VERSION_ISCSI='2.0-871'
-VERSION_LVM='2.02.28'
+VERSION_LVM='2.02.74'
 VERSION_UNIONFS_FUSE='0.22'
+VERSION_GPG='1.4.11'
 
 MY_HOME="http://wolf31o2.org"
 RH_HOME="ftp://sources.redhat.com/pub"
@@ -30,7 +31,8 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 		http://www.open-iscsi.org/bits/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"
+		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
@@ -86,6 +88,7 @@ src_install() {
 		-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
@@ -114,6 +117,7 @@ src_install() {
 		"${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..."