Fix KEYWORDS and remove the -9999 ebuild, since the one in the tree is fine.

svn path=/; revision=155

3 files changed, 3 insertions, 130 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index b8ac922..2f21177 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -6,5 +6,4 @@ DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95e
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
 DIST genkernel-3.4.10_pre5.tar.bz2 206472 RMD160 68f4ddc2352c7aae7cd65475654b45600d4f4700 SHA1 1ea177aaaadf84287a7170a0651a0d95b021a800 SHA256 07ad8e244bd97a80a9c6a4bf3169433b268e384e519ee27ab1fa9b3cd83abf93
 DIST genkernel-pkg-3.4-r4.tar.bz2 1915990 RMD160 5b07a74677f6c2be6b2bbd41bfe4ff87f05fa4f8 SHA1 96dc2703128ad05251be6fd26c0830bd9e628b9c SHA256 1a5150ee6106c49b641ade2743ce03232f8e3663b6d0597bf28f5b468e534aff
-EBUILD genkernel-3.4.10_pre5.ebuild 4238 RMD160 1ac2ac8a55f3855dfaa0107f9f8b1fd4f81adecd SHA1 fe560e4b06045ef2310a517702e683528b9ecb97 SHA256 fe154020ba7661dc86b68740c627a6f1e156fdb5db2be9b9d24c79666707fe39
-EBUILD genkernel-9999.ebuild 4238 RMD160 1ac2ac8a55f3855dfaa0107f9f8b1fd4f81adecd SHA1 fe560e4b06045ef2310a517702e683528b9ecb97 SHA256 fe154020ba7661dc86b68740c627a6f1e156fdb5db2be9b9d24c79666707fe39
+EBUILD genkernel-3.4.10_pre5.ebuild 4238 RMD160 e215591eeef4487185a39ea5e410a473a65ff5a7 SHA1 96138bf1176c2fa6bfe3ae7cc9abdb600bb2cfc6 SHA256 75981e55a13f0f531b485407471c57c5e91c9e67c3a1195dde7ff262fd89d5f5
diff --git a/sys-kernel/genkernel/genkernel-3.4.10_pre5.ebuild b/sys-kernel/genkernel/genkernel-3.4.10_pre5.ebuild
index 2f7054a..9f2cc37 100644
--- a/sys-kernel/genkernel/genkernel-3.4.10_pre5.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.10_pre5.ebuild
@@ -51,9 +51,9 @@ 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="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-KEYWORDS=""
+#KEYWORDS=""
 IUSE="ibm selinux"
 
 DEPEND="sys-fs/e2fsprogs
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
deleted file mode 100644
index 2f7054a..0000000
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.9.ebuild,v 1.2 2008/01/14 19:43:54 wolf31o2 Exp $
-
-# genkernel-9999        -> latest SVN
-# genkernel-9999.REV    -> use SVN REV
-# genkernel-VERSION     -> normal genkernel release
-
-VERSION_BUSYBOX='1.7.4'
-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"
-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
-		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:" \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		"${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}"/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
-}
-
-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
-}