Version bump to 3.4.10_pre2 for testing and bumping genkernel-pkg revision.

(Portage version: 2.1.4.4)

3 files changed, 131 insertions, 3 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 688fcaea7963..89566060568b 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.189 2008/02/14 04:33:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.190 2008/02/14 06:57:17 wolf31o2 Exp $
+
+*genkernel-3.4.10_pre2 (14 Feb 2008)
+
+  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  +genkernel-3.4.10_pre2.ebuild, genkernel-9999.ebuild:
+  Version bump to 3.4.10_pre2 for testing and bumping genkernel-pkg revision.
 
 *genkernel-9999 (14 Feb 2008)
 *genkernel-3.4.10_pre1 (14 Feb 2008)
diff --git a/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild b/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild
new file mode 100644
index 000000000000..acd02a0cbaa7
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild,v 1.1 2008/02/14 06:57:17 wolf31o2 Exp $
+
+# genkernel-9999		-> latest SVN
+# genkernel-9999.REV	-> use SVN REV
+# genkernel-VERSION		-> normal genkernel release
+
+VERSION_DMAP='1.02.22'
+VERSION_DMRAID='1.0.0.rc14'
+VERSION_E2FSPROGS='1.39'
+VERSION_LVM='2.02.28'
+VERSION_PKG='3.4-r4'
+
+MY_HOME="http://dev.gentoo.org/~wolf31o2"
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+
+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
+		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
+
+if [[ ${PV} == 9999* ]]
+then
+	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
+	ESVN_REPO_URI="svn://anonsvn.gentoo.org/genkernel/trunk"
+	inherit subversion bash-completion eutils
+	S=${WORKDIR}/trunk
+	SRC_URI="${COMMON_URI}"
+else
+	inherit bash-completion eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
+		${MY_HOME}/${P}.tar.bz2
+		${MY_HOME}/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
+		${COMMON_URI}"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+# 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"
+#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+#KEYWORDS=""
+IUSE="ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		subversion_src_unpack
+	else
+		unpack ${P}.tar.bz2
+		cd "${S}"
+		unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
+	fi
+	use selinux && sed -i 's/###//g' gen_compile.sh
+}
+
+src_install() {
+	# This block updates genkernel.conf
+	sed -e "s:VERSION_DMAP:$VERSION_DMAP:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		"${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 ChangeLog README TODO || die "dodoc"
+
+	rm -f genkernel.8 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}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
+
+	dodir /usr/bin
+	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
+
+	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 \
+	"${D}"/usr/share/genkernel/pkg || die "copying 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
+}
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 0bb2f2cf3ad2..c314cc6531b6 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1 2008/02/14 04:33:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.2 2008/02/14 06:57:17 wolf31o2 Exp $
 
 # genkernel-9999		-> latest SVN
 # genkernel-9999.REV	-> use SVN REV
@@ -10,7 +10,7 @@ VERSION_DMAP='1.02.22'
 VERSION_DMRAID='1.0.0.rc14'
 VERSION_E2FSPROGS='1.39'
 VERSION_LVM='2.02.28'
-VERSION_PKG='3.4-r3'
+VERSION_PKG='3.4-r4'
 
 MY_HOME="http://dev.gentoo.org/~wolf31o2"
 RH_HOME="ftp://sources.redhat.com/pub"