Sync -9999 ebuild with new _pre7 ebuild and fix KEYWORDS.

Package-Manager: portage-2.1.4.4

3 files changed, 7 insertions, 26 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 8e0a14f355e8..843ea3a47a2d 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,9 @@
 # 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.197 2008/03/14 15:54:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.198 2008/03/14 19:54:04 wolf31o2 Exp $
+
+  14 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> genkernel-9999.ebuild:
+  Sync -9999 ebuild with new _pre7 ebuild and fix KEYWORDS.
 
 *genkernel-3.4.10_pre7 (14 Mar 2008)
 *genkernel-3.4.10_pre6 (14 Mar 2008)
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 8559a02d1eac..f10eef4ec7b4 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -22,13 +19,6 @@ EBUILD genkernel-3.4.10_pre5.ebuild 4244 RMD160 5fe9eab9f56d6ee8cb179e98da73e6c0
 EBUILD genkernel-3.4.10_pre6.ebuild 4244 RMD160 a933ea35026ff8c5f6dc5fe12b16eb9bb886b658 SHA1 f2ac73b2c63f126fa3c2120ac4068460b0451bc7 SHA256 86d78ec736589e77d90bfc6cb31b3c13ce6dce421d78837a1095f82c6ec8a398
 EBUILD genkernel-3.4.10_pre7.ebuild 3754 RMD160 caccd351fb31b62417079b872d1751f3489da15a SHA1 6325462bea426f94b6e1dead55877dc791c2659a SHA256 814287bec002ee5bbcce63d91160b0fc610de10769d90bae7642d619691159f7
 EBUILD genkernel-3.4.9.ebuild 3727 RMD160 db052ce94581209bf666290c3bcfc415f5028ae2 SHA1 10fd64150a842c0f98fb6eacf6e577051b9999c8 SHA256 1843149fd24176e38e5de48527a5f4211a4aee6aeffc67cb8a8dd2e26bd81534
-EBUILD genkernel-9999.ebuild 4236 RMD160 0937284730c6091dd2c8caaa05f5eda66dbfb59d SHA1 d0fa45f9a8a0f3518b46a2ecdcaf849eeb005f25 SHA256 5fc9db200e6085749e06413094573a7dcda8be95690a13428d44cce364fdcaf8
-MISC ChangeLog 38105 RMD160 5d2d749a44950ea9f049c96644c427a6d6c0a428 SHA1 99813f25b5a7d937d9ce70583381a0e1b4b46d86 SHA256 71352da6050401f66ecd90ed74d652fd07f6e140289eec1e2a50d23a26f3b0ee
+EBUILD genkernel-9999.ebuild 3747 RMD160 33fd0c0749480f869b23fc0a376357fd37f6bd56 SHA1 825316a0c8da6ba40c01cfdd3a948db1b929b889 SHA256 66d883c4832dc5b528b7c22ef8bde3f3f4b9a510f85806767ac8d41dea9cfbcc
+MISC ChangeLog 38243 RMD160 11694c1c5bd25a723b77707fad0ec3937a638bfe SHA1 058a8b1f832033edde98a89a98112647e9b7e042 SHA256 7546f5686c85299058f2dc4f69d1f5f57d876f9c567f448cb9cf186f4c03b4f3
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH2p+akT4lNIS36YERAtu/AJwNga8aZtyeaTCPMKw7nA6tHhHupgCdH/kL
-k9DJmNDoScRx4Pb797CAYPw=
-=Gacd
------END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index e6f8263be384..e88043ae3422 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.6 2008/03/12 04:20:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.7 2008/03/14 19:54:04 wolf31o2 Exp $
 
 # genkernel-9999        -> latest SVN
 # genkernel-9999.REV    -> use SVN REV
@@ -11,7 +11,6 @@ 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"
@@ -37,9 +36,7 @@ then
 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
 
@@ -65,8 +62,6 @@ src_unpack() {
 		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
 }
@@ -95,13 +90,6 @@ src_install() {
 	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
 
-	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 \
-	"${D}"/usr/share/genkernel/pkg || die "copying pkg"
-
 	dobashcompletion "${FILESDIR}"/genkernel.bash
 }