From e25ee3dd940833c308dcb9ce762754ef9d3c85b7 Mon Sep 17 00:00:00 2001
From: Adam Mondl <tocharian@gentoo.org>
Date: Wed, 12 Jan 2005 19:27:19 +0000
Subject: [PATCH] Mark 2.6.7-r18 stable for x86; older ebuilds removed.

---
 sys-kernel/hardened-dev-sources/ChangeLog     | 10 ++++-
 sys-kernel/hardened-dev-sources/Manifest      |  8 +---
 .../digest-hardened-dev-sources-2.6.7-r15     |  4 --
 .../digest-hardened-dev-sources-2.6.7-r16     |  3 --
 .../hardened-dev-sources-2.6.7-r15.ebuild     | 38 -------------------
 .../hardened-dev-sources-2.6.7-r16.ebuild     | 30 ---------------
 .../hardened-dev-sources-2.6.7-r18.ebuild     |  4 +-
 7 files changed, 13 insertions(+), 84 deletions(-)
 delete mode 100644 sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r15
 delete mode 100644 sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r16
 delete mode 100644 sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r15.ebuild
 delete mode 100644 sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r16.ebuild

diff --git a/sys-kernel/hardened-dev-sources/ChangeLog b/sys-kernel/hardened-dev-sources/ChangeLog
index 944a38e6531c..0e46075ad4bb 100644
--- a/sys-kernel/hardened-dev-sources/ChangeLog
+++ b/sys-kernel/hardened-dev-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/hardened-dev-sources
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.50 2005/01/12 04:43:06 tocharian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.51 2005/01/12 19:27:19 tocharian Exp $
+
+*hardened-dev-sources-2.6.7-r16 (12 Jan 2005)
+
+  12 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  -hardened-dev-sources-2.6.7-r15.ebuild,
+  -hardened-dev-sources-2.6.7-r16.ebuild,
+  hardened-dev-sources-2.6.7-r18.ebuild:
+  Mark 2.6.7-r18 stable for x86; older ebuilds removed.
 
 *hardened-dev-sources-2.6.10-r1 (11 Jan 2005)
 
diff --git a/sys-kernel/hardened-dev-sources/Manifest b/sys-kernel/hardened-dev-sources/Manifest
index e9a1fb549ab8..12ee9a1a6d9c 100644
--- a/sys-kernel/hardened-dev-sources/Manifest
+++ b/sys-kernel/hardened-dev-sources/Manifest
@@ -1,14 +1,10 @@
 MD5 a2be8a9836af42c9226f89173d8500ac hardened-dev-sources-2.6.7-r17.ebuild 846
-MD5 eae3b7cf4246faa1fcfdaba5a5b79c68 hardened-dev-sources-2.6.7-r16.ebuild 1102
 MD5 9d18670d9091077aeecbdaf6b6585d55 hardened-dev-sources-2.6.10.ebuild 943
 MD5 9049991ad70c7a15891d779823bf2ecf hardened-dev-sources-2.6.10-r1.ebuild 904
-MD5 6578238882effba13162a182c2a884ce hardened-dev-sources-2.6.7-r18.ebuild 827
-MD5 800f66d3d7a4a105bc0ca9b43c941b16 hardened-dev-sources-2.6.7-r15.ebuild 1625
-MD5 b20cea0ff99258eea40596aca6581324 ChangeLog 10199
+MD5 d282f89be588709cb4637e8290108c4a hardened-dev-sources-2.6.7-r18.ebuild 826
+MD5 e48514085d375af15c032febe70b3c8c ChangeLog 10477
 MD5 73174f8e07b82c5df563b7196f87611c metadata.xml 299
 MD5 68f01535106afe7239afd44753eda283 files/digest-hardened-dev-sources-2.6.10-r1 145
-MD5 9e6c1b6614cbee8ec1148ec31f9796d7 files/digest-hardened-dev-sources-2.6.7-r15 310
-MD5 7ed7ee042a6bf15e314455a56850722e files/digest-hardened-dev-sources-2.6.7-r16 219
 MD5 c31bb326fa501ea8c6ae2b8a9bb9856b files/digest-hardened-dev-sources-2.6.7-r17 144
 MD5 4abf4c147376885b39ccf54d0eaef84f files/digest-hardened-dev-sources-2.6.7-r18 144
 MD5 bc48c226344f94535c3ba2e0ce55bf24 files/hardened-dev-sources-2.6.7.CAN-2004-0816.patch 1694
diff --git a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r15 b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r15
deleted file mode 100644
index 7f5cac3d25b1..000000000000
--- a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r15
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
-MD5 ecdbe38dbae9c1b628636951658fab7a hardened-patches-2.6-7.8.tar.bz2 151973
-MD5 474e3699f5e01b0cde26845e18d32f4b hardened-dev-sources-2.6.7-CAN-2004-0814.patch 131698
-MD5 d289935571088e5c55b3833063a967b1 genpatches-2.6-7.46-base.tar.bz2 63281
diff --git a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r16 b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r16
deleted file mode 100644
index 0c8fb0ec30a2..000000000000
--- a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
-MD5 652b4c0f99c27bbe345a9864af143cff hardened-patches-2.6-7.9.tar.bz2 180927
-MD5 d289935571088e5c55b3833063a967b1 genpatches-2.6-7.46-base.tar.bz2 63281
diff --git a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r15.ebuild b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r15.ebuild
deleted file mode 100644
index fed37643c40d..000000000000
--- a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r15.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r15.ebuild,v 1.3 2005/01/11 21:15:57 tocharian Exp $
-
-IUSE=""
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-GPV=7.46
-GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
-
-HGPV=7.8
-#HGPV_SRC="mirror://gentoo/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-HGPV_SRC="http://dev.gentoo.org/~tseng/kernel/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2
-		  http://tocharian.ath.cx/hardened/hardened-dev-sources-r15/hardened-dev-sources-2.6.7-CAN-2004-0814.patch"
-
-UNIPATCH_STRICTORDER="yes"
-UNIPATCH_EXCLUDE="1315_alpha"
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2
-		       ${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
-			   ${FILESDIR}/hardened-dev-sources-2.6.7.CAN-2004-0816.patch
-			   ${FILESDIR}/h-d-s-2.6.7-amd64-kill-vm_force_exec32.patch
-			   ${FILESDIR}/hardened-2.6.7-binfmt_elf.patch
-			   ${FILESDIR}/hardened-2.6.7-binfmt_aout.patch
-			   ${FILESDIR}/hardened-dev-sources-2.6.7-ptmx.patch
-			   ${DISTDIR}/hardened-dev-sources-2.6.7-CAN-2004-0814.patch
-			   ${FILESDIR}/hardened-dev-sources-2.6.7-CAN-2004-0883.patch"
-UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GPV_SRC}"
-KEYWORDS="x86 ~ppc amd64"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r16.ebuild b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r16.ebuild
deleted file mode 100644
index efd991a0b3fc..000000000000
--- a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r16.ebuild,v 1.2 2005/01/11 21:15:57 tocharian Exp $
-
-IUSE=""
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-GPV=7.46
-GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
-
-HGPV=7.9
-#HGPV_SRC="mirror://gentoo/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-HGPV_SRC="http://dev.gentoo.org/~tseng/kernel/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-UNIPATCH_EXCLUDE="1315_alpha"
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2
-		       ${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
-UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GPV_SRC}"
-KEYWORDS="x86 ~ppc amd64"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r18.ebuild b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r18.ebuild
index e8b71da48b89..b1fb98efa70a 100644
--- a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r18.ebuild
+++ b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r18.ebuild,v 1.2 2005/01/11 21:15:57 tocharian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r18.ebuild,v 1.3 2005/01/12 19:27:19 tocharian Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -19,7 +19,7 @@ UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGP
 DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 pkg_postinst() {
 	postinst_sources
-- 
2.26.2