merged 2.4.23-r1 changes into 2.4.23, removed 2.4.23-r1

5 files changed, 9 insertions, 69 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 2acdb890fd89..264f178270bd 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.34 2003/12/06 15:56:13 scox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.35 2003/12/06 16:34:59 scox Exp $
 
-*xfs-sources-2.4.23-r1 (06 Dec 2003)
+*xfs-sources-2.4.23 (06 Dec 2003)
 
   06 Dec 2003; Andrea Luzzardi <scox@gentoo.org> 
-  xfs-sources-2.4.23-r1.ebuild:
-  Version bump, fixed the make xconfig target, closes bug #35190.
+  xfs-sources-2.4.23.ebuild:
+  Fixed the make xconfig target, closed bug #35190.
 
 *xfs-sources-2.4.23 (03 Dec 2003)
 
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index bd8531935a0b..21be293bcc3f 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 9a34067c1723832f1cbda9eaab63fdee xfs-sources-2.4.23.ebuild 1794
+MD5 753f9e1aec157b773b352bf2f3911504 xfs-sources-2.4.23.ebuild 1903
 MD5 dd6ee1f917d97dff4db5e3ce25c4486d xfs-sources-2.4.20-r1.ebuild 2193
 MD5 db428299389ac834854b0732c5d0bec4 xfs-sources-2.4.19-r2.ebuild 2123
 MD5 7d250d77b5ca14b9e7b5f37d6ab79dd7 xfs-sources-2.4.20.ebuild 2203
@@ -6,7 +6,7 @@ MD5 59959a88007dd2b87ac5e73322e4e1de xfs-sources-2.4.20-r3.ebuild 2296
 MD5 48e098d9147d10a695585c51a033aa9c xfs-sources-2.4.22.ebuild 2255
 MD5 e0dc97f85ee89d05e1f0808e96ad15d1 xfs-sources-2.4.20-r2.ebuild 2202
 MD5 3e1479535c336200a4cc66e7b22887d3 xfs-sources-2.4.20-r4.ebuild 2322
-MD5 eca040ee2ebd95e9d269959a528ae29b ChangeLog 9093
+MD5 e367b89e4f6f166517e243b0e080c3cb ChangeLog 9187
 MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
 MD5 26b986cdd4c24df8ad3d0f0b21e802be files/digest-xfs-sources-2.4.22 139
 MD5 14debb591d3f9f421190973411bc3751 files/digest-xfs-sources-2.4.23 139
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23-r1 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23-r1
deleted file mode 100644
index cdd6859dcf2e..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 09ea5098f6b66023b2f016e985d0d15e patches-2.4.23-xfs.tar.bz2 1428396
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.23-r1.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.23-r1.ebuild
deleted file mode 100644
index 9c5432756604..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.23-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.23-r1.ebuild,v 1.1 2003/12/06 15:56:13 scox Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel
-OKV=2.4.23
-EXTRAVERSION=-${P/-sources-2.4.23}
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="~x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in *freeswan*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-
-	cd ${S}
-        epatch ${FILESDIR}/xconfig_target_fix.patch || die "failed to fix xconfig"
-
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild
index c843fb25348a..bd807ed7a4da 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild,v 1.1 2003/12/03 19:00:18 scox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild,v 1.2 2003/12/06 16:34:59 scox Exp $
 
 IUSE="build crypt"
 
@@ -50,6 +50,7 @@ src_unpack() {
 	else
 		einfo "Cryptographic support enabled..."
 	fi
-
 	kernel_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/xconfig_target_fix.patch || die "failed to fix xconfig"
 }