added jenkernel, my genkernel fork

3 files changed, 39 insertions, 31 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/jenkernel/Manifest
index 961d1bc..07d59e5 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/jenkernel/Manifest
@@ -1,12 +1,12 @@
 AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
-DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb
-DIST busybox-1.7.4.tar.bz2 1727940 RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c19b SHA1 e5dcaa25525ca63663c3d4e7027897fed54a4f95 SHA256 8480a7c1b9ac0fddff55e8daae807ccf0a47aa292137fa8c9f97cf0733b459c7
+DIST LVM2.2.02.74.tgz 943084 RMD160 e5cb2a9e304c4075f05aecd03d67aa53eda9e43e SHA1 fc6cd04e4a908906c6f596ad99948140728be99c SHA256 a40c80c5b9a2547b8bd63e9321d7037c8bf041a35f734a5766ad2848d80bb697
+DIST busybox-1.18.1.tar.bz2 2129404 RMD160 fb40d19103945eb1cd785a6041e5545f4055b8f6 SHA1 83b86858599870e46236da8d370d335d48cee77e SHA256 33eb25ea7b20c727c3af769256b21408a1ac1f927ff9f89a1f1e3767c18c9967
 DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
-DIST e2fsprogs-1.40.9.tar.gz 4092812 RMD160 1cc51cb1b4bdcb338a2fdff50c79f38fb6e09eef SHA1 c584e9a8d3c444f42f4c0a786bb94f4a00ea2b48 SHA256 ab6852230dcb30d75f640125a5d0c7b496bbc31502afdb76528e3bcd4089c9e4
+DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098e27e8 SHA1 24f9364fa3d4c0d7d00cb627b819d0e51055d6c5 SHA256 3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176
 DIST fuse-2.7.4.tar.gz 506658 RMD160 fe1808cfd58ad6651259245b424301e99881faa2 SHA1 7a86f5cf39f38e64ccbae093599d64a895b950ba SHA256 c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
-DIST klibc-1.5.17.tar.bz2 502794 RMD160 6d259b65b090e6de8759830ba8db638964833051 SHA1 15c0a98982911c04cb3ecb24db06bb4eeb9473a5 SHA256 a67b976db1958a66bb4887d70c45f83f63751a287b5a715c929fb69bdcd7b1ca
+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 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
-DIST v86d-0.1.9.tar.bz2 69752 RMD160 e2d9cda4e8b40a5002c8448d1954a06c5fddb3bf SHA1 ca16ae61329847955ca65da3222131866703a02a SHA256 8167dec4ff919cfd73f854bbd3244f05c2b867e014fa8298044ea7cfd66d18a8
-EBUILD genkernel-9999.ebuild 5175 RMD160 26b4adb3543d2f1d9c359ad9c25c83c18c3cd0bc SHA1 0d2394f43e5fe2db230e7b97304a22059800dc0e SHA256 52400ab752975a73446ecc2eba954c6a92cdd82af359c9b0b80245fdf5dd950b
+EBUILD jenkernel-9999.ebuild 5215 RMD160 f793c2af2cccc2ad813ec325da3e5fbccd30d78b SHA1 4e54bd76f0addee5b7014d639c030d7d504443dd SHA256 729ac5a8f32e647f709b79e44492d2ef62622185e1159e069272a3c7d228ed8d
diff --git a/sys-kernel/genkernel/files/genkernel.bash b/sys-kernel/jenkernel/files/genkernel.bash
index ed6b1c1..ed6b1c1 100644
--- a/sys-kernel/genkernel/files/genkernel.bash
+++ b/sys-kernel/jenkernel/files/genkernel.bash
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/jenkernel/jenkernel-9999.ebuild
index d0a3e25..0353672 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/jenkernel/jenkernel-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.10.903.ebuild,v 1.1 2009/01/05 22:31:16 agaffney Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.24 2011/01/23 18:33:09 sping Exp $
 
-# genkernel-9999        -> latest SVN
-# genkernel-9999.REV    -> use SVN REV
+# 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_LVM='2.02.28'
+VERSION_MDADM='3.1.4'
+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_KLIBC='1.5.17'
-VERSION_V86D='0.1.9'
+VERSION_GPG='1.4.11'
 
 MY_HOME="http://wolf31o2.org"
 RH_HOME="ftp://sources.redhat.com/pub"
@@ -24,30 +24,34 @@ 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
 		${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://kernel/linux/libs/klibc/1.5/klibc-${VERSION_KLIBC}.tar.bz2
-		http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-${VERSION_V86D}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz"
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
 
 if [[ ${PV} == 9999* ]]
 then
-	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
-	EGIT_REPO_URI="git://git.chaox.net/jens/genkernel.git"
+	EGIT_REPO_URI="git://github.com/jensp/jenkernel.git"
+	[[ ${PV} == 99999* ]] && EGIT_BRANCH=experimental
 	inherit git bash-completion eutils
-	S="${WORKDIR}"
+	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"
@@ -56,40 +60,44 @@ 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"
 
+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_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_DMAP:$VERSION_DMAP:" \
+		-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_KLIBC:$VERSION_KLIBC:" \
-		-e "s:VERSION_V86D:$VERSION_V86D:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
@@ -111,6 +119,7 @@ src_install() {
 	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}"/device-mapper.${VERSION_DMAP}.tgz \
@@ -118,8 +127,7 @@ src_install() {
 		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
 		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
 		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
-		"${DISTDIR}"/klibc-${VERSION_KLIBC}.tar.bz2 \
-		"${DISTDIR}"/v86d-${VERSION_V86D}.tar.bz2 \
+		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
 		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
 		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."