Stabilize =sys-kernel/hardened-sources-2.6.28-r9 and remove 2.6.28-r6.

(Portage version: 2.1.6.11/cvs/Linux i686)

3 files changed, 7 insertions, 53 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index c5d0d0bf4117..6fddabd11a10 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.309 2009/05/25 04:36:12 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.310 2009/05/29 07:53:10 gengor Exp $
+
+  29 May 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.28-r6.ebuild, hardened-sources-2.6.28-r9.ebuild:
+  Stable amd64/x86 and remove old.
 
 *hardened-sources-2.6.29 (25 May 2009)
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r6.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.28-r6.ebuild
deleted file mode 100644
index 6d053f31b95f..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.28-r6.ebuild,v 1.4 2009/05/01 23:52:38 gengor Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="7"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7"
-HGPV_URI="http://dev.gentoo.org/~gengor/distfiles/${CATEGORY}/${PN}/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.5.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.1.13*"
-
-	ewarn
-	ewarn "As of ${CATEGORY}/${PN}-2.6.24 the predefined"
-	ewarn "\"Hardened [Gentoo]\" grsecurity level has been removed."
-	ewarn "Two improved predefined security levels replace it:"
-	ewarn "\"Hardened Gentoo [server]\" and \"Hardened Gentoo [workstation]\""
-	ewarn
-	ewarn "Those who intend to use one of these predefined grsecurity levels"
-	ewarn "should read the help associated with the level. Users importing a"
-	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.24,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with kernel series ${OKV}."
-	ewarn "Therefore, it is strongly recommended that the following command is"
-	ewarn "issued prior to booting a ${P} series kernel for"
-	ewarn "the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild
index f29244f5fbb1..470d284d2d4b 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild,v 1.1 2009/05/25 02:31:57 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild,v 1.2 2009/05/29 07:53:10 gengor Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -20,7 +20,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 pkg_postinst() {
 	kernel-2_pkg_postinst