Fixes minor build error in ppc.

(Portage version: 2.0.53_rc6)

5 files changed, 17 insertions, 32 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index a35a8a601753..40b162d6ca83 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.63 2005/10/17 16:25:19 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.64 2005/10/20 18:58:32 johnm Exp $
+
+*hardened-sources-2.6.13-r2 (20 Oct 2005)
+
+  20 Oct 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.13.ebuild, -hardened-sources-2.6.13-r1.ebuild,
+  +hardened-sources-2.6.13-r2.ebuild:
+  Fixes minor build error in ppc.
 
 *hardened-sources-2.6.13-r1 (17 Oct 2005)
 
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.13 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.13
deleted file mode 100644
index e6100199afb3..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
-MD5 c890eb4def7d0e948ac09e38144925fc hardened-patches-2.6.13-1.extras.tar.bz2 144834
-MD5 eb50f5eb60247dd01e24a6854ab31979 genpatches-2.6.13-2.base.tar.bz2 31281
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.13-r1 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.13-r2
index 78e7f12b6f93..ebe8b9b22c24 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.13-r1
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.13-r2
@@ -1,3 +1,3 @@
 MD5 7fa94be8c013a5fd965e19e2ab8898b7 genpatches-2.6.13-6.base.tar.bz2 50173
-MD5 fd78fdd0e049ba51f8c41832b07eb50b hardened-patches-2.6.13-2.extras.tar.bz2 145516
+MD5 968e61a184db7a5fff6c9efb2cf186f8 hardened-patches-2.6.13-3.extras.tar.bz2 145529
 MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.13-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.13-r2.ebuild
index 3ad902746d96..276bca6b96e6 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.13-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.13-r2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2005 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.13-r1.ebuild,v 1.1 2005/10/17 16:25:19 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.13-r2.ebuild,v 1.1 2005/10/20 18:58:32 johnm Exp $
 
 ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="6"
+
 inherit kernel-2
 detect_version
+detect_arch
 
-GPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2
-GPV_SRC="mirror://gentoo/genpatches-${GPV}.base.tar.bz2"
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3
 HGPV_SRC="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/genpatches-${GPV}.base.tar.bz2
-			   ${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
 DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
-SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GPV_SRC}"
+SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GENPATCHES_URI} ${ARCH_URI}"
 KEYWORDS="~x86 ~ppc ~amd64"
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.13.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.13.ebuild
deleted file mode 100644
index a3a3ba547f56..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.13.ebuild
+++ /dev/null
@@ -1,19 +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-sources/hardened-sources-2.6.13.ebuild,v 1.1 2005/09/16 19:47:18 johnm Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-GPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1
-GPV_SRC="mirror://gentoo/genpatches-${GPV}.base.tar.bz2"
-HGPV_SRC="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/genpatches-${GPV}.base.tar.bz2
-			   ${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GPV_SRC}"
-KEYWORDS="~x86 ~ppc ~amd64"