Update with ewarn of no xfs support & fixed possible issue with dropping crypto flags

3 files changed, 18 insertions, 35 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index ddc989db9d41..56d790bd63e0 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.19 2003/03/19 06:14:24 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.20 2003/03/21 20:08:48 pfeifer Exp $
 
 *gentoo-sources-2.4.20-r2 (19 Mar 2003)
+  
+  21 Mar 2003; Jay Pfeifer <pfeifer@gentoo.org> gentoo-sources-2.4.20-r2.ebuild:
+  Package is currently marked unstable.
+  * Added ebuild note of lack of xfs support (use xfs-sources for xfs)
+  * Removed dropping of crypt patches... if you don't need them, don't enable in the .confg 
 
   19 Mar 2003; Jay Pfeifer <pfeifer@gentoo.org> gentoo-sources-2.4.20-r2.ebuild:
   Package is currently marked unstable.
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild
index a48531033604..e5a9f3f0dcc9 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild,v 1.2 2003/03/21 07:17:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild,v 1.3 2003/03/21 20:08:48 pfeifer Exp $
 
-IUSE="build crypt xfs"
+IUSE="build"
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -20,7 +20,7 @@ ETYPE="sources"
 inherit kernel || die
 OKV="2.4.20"
 # Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/lolo-sources-${PV}/patches.txt.gz
+# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
@@ -29,8 +29,6 @@ HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -arm"
 SLOT="${KV}"
-DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl >=sys-apps/modutils-2.4.2 sys-devel/make"
 
 
 src_unpack() {
@@ -40,7 +38,6 @@ src_unpack() {
 	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!
-
 	# If the compiler isn't gcc3 drop the gcc3 patches
 	if [[ "${COMPILER}" == "gcc3" ]];then
 		einfo "You are using gcc3.x"
@@ -55,17 +52,6 @@ src_unpack() {
 		done
 	fi
 
-	# This is the ratified crypt USE flag, enables IPSEC & USAGI
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 6* 7* 8* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
 	kernel_src_unpack
 }
 
@@ -73,6 +59,9 @@ pkg_postinst() {
 
 	kernel_pkg_postinst
 
+	ewarn "Gentoo sources no longer contains support for xfs."
+	ewarn "Use xfs-sources if you need xfs support in your kernel."
+	echo
 	einfo "Please be warned, you have just installed a unstable"
 	einfo "patchset of the Gentoo Linux kernel sources."
 	einfo "This set contains the ptrace patch."
diff --git a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre1.ebuild b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre1.ebuild
index 9722648b0397..3c69852abce4 100644
--- a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre1.ebuild
+++ b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre1.ebuild,v 1.2 2003/03/21 07:17:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre1.ebuild,v 1.3 2003/03/21 20:08:48 pfeifer Exp $
 
-IUSE="build crypt xfs"
+IUSE="build"
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -20,7 +20,7 @@ ETYPE="sources"
 inherit kernel || die
 OKV="2.4.20"
 # Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/lolo-sources-${PV}/patches.txt.gz
+# to /usr/share/doc/pfeifer-sources-${PV}/patches.txt.gz
 
 DESCRIPTION="Full sources for the experimental Gentoo Kernel. Patches from here may move into sys-kernel/gentoo-sources"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
@@ -29,8 +29,6 @@ HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -arm"
 SLOT="${KV}"
-DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl >=sys-apps/modutils-2.4.2 sys-devel/make"
 
 
 src_unpack() {
@@ -40,7 +38,6 @@ src_unpack() {
 	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!
-
 	# If the compiler isn't gcc3 drop the gcc3 patches
 	if [[ "${COMPILER}" == "gcc3" ]];then
 		einfo "You are using gcc3.x"
@@ -55,17 +52,6 @@ src_unpack() {
 		done
 	fi
 
-	# This is the ratified crypt USE flag, enables IPSEC & USAGI
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 6* 7* 8* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
 	kernel_src_unpack
 }
 
@@ -73,6 +59,9 @@ pkg_postinst() {
 
 	kernel_pkg_postinst
 
+	ewarn "There is no xfs support in this kernel."
+	ewarn "If you need xfs support, emerge xfs-sources."
+	echo
 	einfo "Please be warned, you have just installed a untested"
 	einfo "patchset of the Gentoo Linux kernel sources."
 	einfo "This set contains the ptrace patch."