Bump, was missing the last commit to flip the default of mounting /usr.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 164 insertions, 2 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 212f7ab26693..2ebd726fd0f8 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,11 @@
 # 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.289 2012/03/11 22:56:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.290 2012/03/12 19:40:57 robbat2 Exp $
+
+*genkernel-3.4.25.1 (12 Mar 2012)
+
+  12 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +genkernel-3.4.25.1.ebuild:
+  Bump, was missing the last commit to flip the default of mounting /usr.
 
 *genkernel-3.4.25-r1 (11 Mar 2012)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 1d6a262ed750..6961a72c5021 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -34,6 +34,7 @@ DIST genkernel-3.4.22.1.tar.bz2 183960 RMD160 643a3fc55b24683754221c0b2fd823ab15
 DIST genkernel-3.4.23.1.tar.bz2 211403 RMD160 b14a7093748b9612e75e6ae8757576dbabcc6691 SHA1 dd794de49a76658ae868c5c7dd5ce51b2cc46bb2 SHA256 9419d506bf9678d9ac4600eb396c7c40dc11c4a3314b0214cfd6194693cb23cf
 DIST genkernel-3.4.23.tar.bz2 208490 RMD160 d6e71614c091ee07417e0f6c3d78731894f63d72 SHA1 5775b53fe28f12915cf60f9a0c1755df4dfc80c9 SHA256 668d6c6f8ab3b8c2fecd5f4acd6791f2c597cdbadeba0a82fa51e51708ca484f
 DIST genkernel-3.4.24.tar.bz2 211436 RMD160 3d29afb7c7bfac64e9cd09f1213fa5913de36643 SHA1 61629d89379b20b6b788c4c88153d6fe294ed657 SHA256 55611c867f1dc96c8711faabb8c17f62b1c5f8be27eb423e39fd53846552476c
+DIST genkernel-3.4.25.1.tar.bz2 192800 RMD160 208e8e0d19ffb98db9e633556fd6c669fd0f81ff SHA1 c65b7e7cf267ff4f9606f46e0247601fcfeb6256 SHA256 561950ba57c2f327364fe07c9310e98c430925d0f758f59a8ce57b9a48305db4
 DIST genkernel-3.4.25.tar.bz2 192564 RMD160 ea65f7e91fa3d9f88807b8372361e0a7d80b6b98 SHA1 4eab9807da8005ab4d9e4542c9c50e9cad1b8d73 SHA256 95bd9643ae97905a957d9cdf6c7ad2f03615f57172845753bcf56d10fa5a313f
 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
@@ -63,7 +64,8 @@ EBUILD genkernel-3.4.23.1.ebuild 5219 RMD160 921154b71f840fb6230e9842bbe9a92bb6d
 EBUILD genkernel-3.4.23.ebuild 5217 RMD160 9ed639986dc65c539e9c0b9b1f5b5422b02796db SHA1 15724286feaf0b932c359bd8d56057a58bc65218 SHA256 79eeb7e937f927cb092547684f69bd873f4b0919844f86db04f34102bebca67a
 EBUILD genkernel-3.4.24.ebuild 5217 RMD160 0933b9ab79a6361f9b20467e2ee5f45dcf712fd1 SHA1 70c2963052eb5e72bda620d783c6157f2f880bee SHA256 ded01e1703520bf999934b5abf5d85e12897621e4d937c360c84cef109168f91
 EBUILD genkernel-3.4.25-r1.ebuild 5140 RMD160 2484ba612d537c728e135a8b005e2409b4537279 SHA1 ac99feb3ca4a63d437138dc81ab8a016018cf6c0 SHA256 07125fbd7d6a6ca6b65c4fe864b6f6e724fe1c6d40e030e3c7f28f5d80307a4f
+EBUILD genkernel-3.4.25.1.ebuild 5139 RMD160 51bb15766e62363cc3ce6723a67404d7df4ae052 SHA1 fa197398a26cc6ab87375eab5469aa1b02c297f4 SHA256 c7669c1053eeb2c36b99e340950c4a2190c68257b592ba79a8c294401b7cd276
 EBUILD genkernel-3.4.25.ebuild 5085 RMD160 ae962d2a131813100f59a802635499d361d720c2 SHA1 3b50595d8aec4886979e7bb7256f82ce26b7418e SHA256 25929de886155289fc97c052dfe8d96203530da934f2925766a61de295fae823
 EBUILD genkernel-9999.ebuild 5110 RMD160 28b22ac97aae43143be3a334b31a9dbd521b2079 SHA1 cbdded844a2f31df2035f96503c476a07b7ecd6c SHA256 2afd05d4361223d86bf8e3d56019984b99e1c750f0a35ea8f2165b102903c037
-MISC ChangeLog 53883 RMD160 4b24f44bc7e1d4d0150d7ed53cc928b97814c2ee SHA1 e1409781b9574d4f86767fc32f99036cd146ba4a SHA256 c4558bc20298609c1277d005eeaf065ec1603d5563d7b58df6328191aaecc44c
+MISC ChangeLog 54074 RMD160 a1601434d62569c82783fd75543d2b6f330a1f5f SHA1 1ca105e29048e737090b1fefea4ea30d86347977 SHA256 0e3fda581600a8642e1c97e69556ef9c1fc63ca59dcc600c7b073a3d9a94efc8
 MISC metadata.xml 205 RMD160 4acb9018c91945d9782cfb80cef7ee98787e7672 SHA1 ead70f12ee5717a53646361197f53f55adb8b25a SHA256 00ad951be56555b432a47451bbf11dd4830ed56aa377d1bc06cbf431525315a3
diff --git a/sys-kernel/genkernel/genkernel-3.4.25.1.ebuild b/sys-kernel/genkernel/genkernel-3.4.25.1.ebuild
new file mode 100644
index 000000000000..34c04ae8877e
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.25.1.ebuild
@@ -0,0 +1,155 @@
+# 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.25.1.ebuild,v 1.1 2012/03/12 19:40:57 robbat2 Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+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'
+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/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/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 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
+		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_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}"/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 \
+		"${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
+	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
+
+	bash-completion_pkg_postinst
+}