Version bump with *alot* of bug fixes and enhancements. Read the changelog.

12 files changed, 31 insertions, 373 deletions

diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 5f3984983d90..12e9d5f9a0f7 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,6 +1,6 @@
 MD5 b63bb42bcd4c1855d79417ec8f0224d6 gentoo-sources-2.4.19-r10.ebuild 2129
-MD5 bf6900b9bf9c8206ab175df4131da378 gentoo-sources-2.4.20-r4.ebuild 4380
-MD5 0075ab08d31a4f7912168ef0d054ea49 ChangeLog 8122
+MD5 8ec52f933ae423999f5e4fd57b7fdd88 gentoo-sources-2.4.20-r4.ebuild 4374
+MD5 c45f54c7867064aaeea51bf06d55cc93 ChangeLog 8122
 MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
 MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r10 146
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r9 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r9
deleted file mode 100644
index 23a241376d0f..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 043051b5895d9b56bafa542fe5249a33 patches-2.4.19-gentoo-r9.tar.bz2 1330682
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r1 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r1
deleted file mode 100644
index 18af8051baba..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 1c4283aa5c293c0c1119e8147c50f92e patches-2.4.20-gentoo-r1.tar.bz2 3078465
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r2 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r2
deleted file mode 100644
index d9aa743143c5..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 98ab92f3997b75cfe80676712863fc25 patches-2.4.20-gentoo-r2.tar.bz2 2519990
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r3 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r3
deleted file mode 100644
index 0358144610d1..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 7c4cf584aeeba65374b9b8f551be60a2 patches-2.4.20-gentoo-r3.tar.bz2 3835119
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r4 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r4
new file mode 100644
index 000000000000..5f966d18ef00
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r4
@@ -0,0 +1,2 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 fb3c75f8c4eb656768b7c951f0b1d661 patches-2.4.20-gentoo-r4.tar.bz2 4142684
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-r9-crypt.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-r9-crypt.patch
deleted file mode 100644
index 5db33b3aa3fb..000000000000
--- a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-r9-crypt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- linux-2.4.19-gentoo-r9/include/linux/netfilter_ipv4/ip_conntrack_core.h.o	Thu Sep 19 16:51:11 2002
-+++ linux-2.4.19-gentoo-r9/include/linux/netfilter_ipv4/ip_conntrack_core.h	Thu Sep 19 16:51:19 2002
-@@ -1,5 +1,7 @@
- #ifndef _IP_CONNTRACK_CORE_H
- #define _IP_CONNTRACK_CORE_H
-+
-+#include <linux/netfilter.h>
- #include <linux/netfilter_ipv4/lockhelp.h>
- 
- /* This header is used to share core functionality between the
---- linux/include/linux/skbuff.h	Sun Sep  8 14:11:22 2002
-+++ linux/include/linux/skbuff.h.new	Sun Sep  8 14:09:38 2002
-@@ -194,7 +194,7 @@
- 	unsigned char 	*end;			/* End pointer					*/
- 
- 	void 		(*destructor)(struct sk_buff *);	/* Destruct function		*/
--#if defined ( CONFIG_NETFILTER || CONFIG_IPSEC )
-+#if defined(CONFIG_NETFILTER) || defined(CONFIG_IPSEC) || defined(CONFIG_IPSEC_MODULE)
- 	/* Can be used for communication between hooks. */
-         unsigned long	nfmark;
- 	/* Cache info */
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-r9-quickfix.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-r9-quickfix.patch
deleted file mode 100644
index 1413cb536e37..000000000000
--- a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-r9-quickfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux/kernel/ksyms.c	Wed Sep  4 23:26:43 2002
-+++ linux/kernel/ksyms.c.new	Wed Sep  4 23:27:07 2002
-@@ -123,8 +123,6 @@
- EXPORT_SYMBOL(kunmap_high);
- EXPORT_SYMBOL(highmem_start_page);
- EXPORT_SYMBOL(create_bounce);
--EXPORT_SYMBOL(kmap_prot);
--EXPORT_SYMBOL(kmap_pte);
- #endif
- 
- /* filesystem internal functions */
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r9.ebuild
deleted file mode 100644
index 962f47b0ec5e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r9.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-IUSE="crypt build"
-
-#we use this next variable to avoid duplicating stuff on cvs
-OKV=2.4.19
-[ "${PR}" == "r0" ] && KV=${OKV}-gentoo || KV=${OKV}-gentoo-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-#Documentation on the patches contained in this kernel will be installed
-#to /usr/share/doc/lolo-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
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 -ppc -sparc "
-
-if [ $ETYPE = "sources" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND="!build? ( >=sys-devel/binutils-2.11.90.0.31 )"
-	RDEPEND="${RDEPEND}
-		 !build? ( >=sys-libs/ncurses-5.2
-			   dev-lang/perl
-			   virtual/modutils
-			   sys-devel/make )"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-	patch -p1 < ${FILESDIR}/lcall-DoS.patch || die "lcall-DoS patch failed"
-	patch -p1 < ${FILESDIR}/i810_drm.patch || die "i810_drm patch
-failed"
-	cd ..
-
-	# Now we need to deal with the tarball of patches.
-	cd ${KV} || die "No patch dir to change to"
-	[ `use crypt` ] || rm 8*
-	#Thers is some anti-grsecurity sentiment, so I'll
-	#make it easy not to patch it in.
-	#Uncomment the following line to not patch grsecurity.
-	#rm 14*
-
-	./addpatches . ${WORKDIR}/linux-${KV} || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-	cd ${S}
-	# Quick Fixes
-	patch -p1 < ${FILESDIR}/gentoo-sources-2.4.19-r9-quickfix.patch \
-		|| die "Ksyms patch failed"
-	# Crypt only quickfix
-	[ `use crypt` ] && \
-		( patch -p1<${FILESDIR}/gentoo-sources-2.4.19-r9-crypt.patch \
-		  || die "crypt patch failed" )
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	# also fix the EXTRAVERSION
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-	
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make distclean || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		cat ${WORKDIR}/${KV}/docs/* > patches.txt
-		dodoc patches.txt
-		mv ${WORKDIR}/linux* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r1.ebuild
deleted file mode 100644
index a592cbbf29da..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r1.ebuild
+++ /dev/null
@@ -1,100 +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/gentoo-sources/gentoo-sources-2.4.20-r1.ebuild,v 1.7 2003/03/11 20:42:57 lostlogic Exp $
-
-IUSE="build crypt xfs"
-
-# 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 || die
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-OKV="2.4.20"
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz with summary in 
-# the package ChangeLog
-
-DESCRIPTION="Full sources for the Gentoo Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/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!
-
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3, check out the special"
-		einfo "processor types just for you"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi		
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches... (USE='-crypt')"
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled... (USE='crypt')"
-	fi
-
-	# This is the non-ratified xfs USE flag, enables XFS which is not
-	# patched by default because it can cause problems with JFS's
-	# journals.
-	if [ -z "`use xfs`" ]; then
-		einfo "No XFS support, is this on purpose? (USE='-xfs')"
-		for file in 79*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		ewarn "Enabling XFS patch, are you sure you want this? (USE='xfs')"
-	fi
-
-	rm -f *3c509-fix
-	rm -f *tcp-window-tracking
-
-	kernel_src_unpack
-}
-
-pkg_postinst() {
-
-	kernel_pkg_postinst
-
-	einfo
-	einfo "You have just installed a specialized, "
-	einfo "high performance patchset of the linux kernel."
-	einfo "If there are problems with it, please report them"
-	einfo "by assigning bugs on bugs.gentoo.org to"
-	einfo "x86-kernel@gentoo.org"
-	ewarn
-	ewarn "If you use iptables, and get an invalid argument error, you"
-	ewarn "simply need to rebuild iptables to solve the problem"
-	ewarn
-	[ `use xfs` ] && ewarn "XFS patches enabled, this may cause JFS problems" || \
-		einfo "XFS not enabled, is that on purpose?  JFS users beware of XFS."
-	ewarn
-
-}
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
deleted file mode 100644
index 1682c782ca1a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild
+++ /dev/null
@@ -1,82 +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/gentoo-sources/gentoo-sources-2.4.20-r2.ebuild,v 1.5 2003/03/21 20:40:17 pfeifer 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 || die
-OKV="2.4.20"
-# Documentation on the patches contained in this kernel will be installed
-# 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
-	mirror://gentoo/patches-${KV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -arm"
-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!
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3.x"
-		einfo "Enabling gcc>31 processor optimizations."
-		einfo "To use, choose the processor family labelled with (gcc>31) in"
-		einfo "Processor type and features -> Processor Family"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		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
-}
-
-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."
-	einfo "If there are issues with it, please report them"
-	einfo "by assigning bugs on bugs.gentoo.org to"
-	einfo "x86-kernel@gentoo.org"
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r4.ebuild
index 37af1a0616e3..9897e302032e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r3.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r4.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-r3.ebuild,v 1.1 2003/04/15 21:00:10 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r4.ebuild,v 1.1 2003/05/08 21:32:50 pfeifer Exp $
 
-IUSE="build crypt evms2 aavm"
+IUSE="build crypt evms2 aavm usagi"
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -22,12 +22,12 @@ OKV="2.4.20"
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
 
-DESCRIPTION="Full sources for the Gentoo Linux kernel"
+DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	mirror://gentoo/patches-${KV}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm"
+KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -arm"
 SLOT="${KV}"
 
 
@@ -35,11 +35,6 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV}/jfs || die "${WORKDIR}/${KV}/jfs does not exist"
-	tar xzf jfs-2.4-1.1.1.tar.gz || die "Failed to unpack jfs files."
-	cp -a Documentation ${S} || die "Failed to copy jfs docs to kernel tree."
-	cp -a fs ${S} || die "Failed to copy jfs source to kernel tree."
-
 	cd ${WORKDIR}/${KV}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
@@ -74,23 +69,21 @@ src_unpack() {
 	# This is the *ratified* evms2 USE flag, enables evms2 support
 	if [ -z "`use evms2`" ]; then
 		einfo "Setting up kernel for EVMS 1.2.1 support(default)."
-		echo
 		for file in 2* ;do
 			einfo "Dropping ${file}..."
 			rm -f ${file}
 		done
 	else
-		einfo "Setting up kernel for EVMS 2.0 support."
+		einfo "Setting up kernel for EVMS 2.0.1 support."
 		ewarn "This is very beta. Please read the 'evms2' doc provided with this kernel."
-		ewarn "It is the install doc from the evms 2.0 tarball."
-		echo
+		ewarn "It is the install doc from the evms 2.0.1 tarball."
 		for file in 1* ;do
 			einfo "Dropping ${file}..."
 			rm -f ${file}
 		done
 	fi
 
-	# This is the crypt USE flag, enables IPSEC & USAGI
+	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
 	if [ -z "`use crypt`" ]; then
 		einfo "No Cryptographic support, dropping patches..."
 		for file in 6* 8* ;do
@@ -98,7 +91,23 @@ src_unpack() {
 			rm -f ${file}
 		done
 	else
-		einfo "Cryptographic support enabled..."
+		einfo "Cryptographic patches will be applied"
+	fi
+
+	# This is the usagi USE flag, keeps USAGI, drops {superfreeswan/patch-int/loop-jari}
+	# Using USAGI will also cause you to drop all iptables ipv6 patches
+	if [ -z "`use usagi`" ]; then
+		einfo "Keeping {superfreeswan/patch-int/loop-jari} patches, dropping USAGI"
+		for file in 6* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Keeping USAGI patch, dropping {superfreeswan/patch-int/loop-jari}"
+		for file in *.ipv6 8* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
 	fi
 
 	kernel_src_unpack
@@ -114,13 +123,11 @@ pkg_postinst() {
 	ewarn "If iptables/netfilter behaves abnormally, such as 'Invalid Argument',"
 	ewarn "you will need to re-emerge iptables to restore proper functionality."
 	echo
-	einfo "Please be warned, you have just installed an unstable"
-	einfo "patchset of the Gentoo Linux kernel sources."
 	einfo "This set contains the ptrace patch as part of grsecurity."
 	echo
-	einfo "If there are issues with it, please report them"
-	einfo "by assigning bugs on bugs.gentoo.org to"
-	einfo "x86-kernel@gentoo.org"
+	einfo "If there are issues with it, please check http://bugs.gentoo.org/"
+	einfo "for an existing bug first. Then create a new bug if you have not found"
+	einfo "one that matches your issue. Assign it to x86-kernel@gentoo.org"
 	echo
 	einfo "Please read the changelog and associated docs for more information."
 }