lots 'o updates

4 files changed, 302 insertions, 104 deletions

diff --git a/sys-kernel/linux-sources/files/digest-linux-sources-2.4.13 b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.13
new file mode 100644
index 000000000000..a0e7dfa904c3
--- /dev/null
+++ b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.13
@@ -0,0 +1,3 @@
+MD5 8df7419287730e97dd46160ce4ab7c59 MOSIX-1.5.2.tar.gz 409600
+MD5 b2b95d9a50f7ef0a2421492ffd31241e linux-2.4.13.tar.bz2 23113728
+MD5 1aa87a35a1d808534cc78f32af0a1b2d lvm_1.0.1-rc4.tar.gz 360448
diff --git a/sys-kernel/linux-sources/linux-sources-2.4.10-r4.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.10-r4.ebuild
index 8ed3fc371979..6fd76d5b4732 100644
--- a/sys-kernel/linux-sources/linux-sources-2.4.10-r4.ebuild
+++ b/sys-kernel/linux-sources/linux-sources-2.4.10-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.10-r4.ebuild,v 1.1 2001/10/15 00:06:45 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.10-r4.ebuild,v 1.2 2001/11/24 01:53:25 drobbins Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -41,7 +41,6 @@ ACPIV=20010920
 # so we need no sources
 [ ! "${PN}" = "linux-extras" ] && SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 http://www.ibiblio.org/gentoo/distfiles/lvm-${LVMV}-${KV}.patch.bz2
-ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${LVMV}.tar.gz
 http://www.tech9.net/rml/linux/preempt-kernel-rml-2.4.10-7.patch
 http://www.uow.edu.au/~andrewm/linux/2.4.10-low-latency.patch.gz
 http://www.uow.edu.au/~andrewm/linux/ext3-dir-speedup.patch
diff --git a/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild
new file mode 100644
index 000000000000..1669b961a9db
--- /dev/null
+++ b/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: System Team <system@gentoo.org>
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild,v 1.3 2001/11/24 01:53:25 drobbins Exp $
+
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+#we use this next variable to avoid duplicating stuff on cvs
+GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
+OKV=${PV}
+KV=${KV}
+S=${WORKDIR}/linux-${KV}
+S2=${WORKDIR}/linux-${KV}-extras
+if [ $PN = "linux-extras" ] 
+then
+	KS=${ROOT}usr/src/linux-${KV}
+	KS2=${ROOT}usr/src/linux-${KV}-extras
+else
+	KS=${S}
+	KS2=${S2}
+fi
+
+# Kernel Features      Enabled   USE Variable      Status
+#
+# Reiserfs             Y         -                 Production-ready
+# JFS                  N         jfs               Testing-only (commented out for now)
+# LVM                  Y         lvm               Production-ready 
+# ext3                 Y         ext3              Production-ready
+# MOSIX                N         mosix             Testing only, probably quite stable
+# XFS                  N         xfs               will probably need to be placed in a separate kernel 
+# PCMCIA-CS            N         pcmcia            Need to move this to its own ebuild
+# lm-sensors           N         lm_sensors        Need to move this to its own ebuild
+
+# Patch Versions
+ACPIV=20011109
+LVMV=1.0.1-rc4
+EXT3V=0.9.15
+LOWLV=2.4.15-pre5
+PREEV="${KV}-1"
+MOSV=1.5.2
+EXT3P="ext3-2.4-${EXT3V}-`echo ${KV} |sed -e 's:\.::g' -e 's:-::'`"
+
+[ "${PN}" = "linux" ] && DESCRIPTION="Linux kernel version ${KV}, including modules, binary tools, libraries and includes"
+[ "${PN}" = "linux-sources" ] && DESCRIPTION="Linux kernel version ${KV} - full sources"
+[ "${PN}" = "linux-extras" ] && DESCRIPTION="Linux kernel support tools and libraries"
+
+# We use build in /usr/src/linux in case of linux-extras
+# so we need no sources
+[ ! "${PN}" = "linux-extras" ] && SRC_URI="http://www.de.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${LVMV}.tar.gz
+http://www.mosix.cs.huji.ac.il/ftps/MOSIX-${MOSV}.tar.gz"
+
+#http://developer.intel.com/technology/iapc/acpi/downloads/acpi-${ACPIV}.diff.gz"
+#http://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel/2.4/preempt-kernel-rml-2.4.15-pre4-1.patch
+#http://www.zip.com.au/~akpm/linux/${LOWLV}-low-latency.patch.gz
+	
+[ "$PN" != "linux-extras" ] && PROVIDE="virtual/kernel"
+
+HOMEPAGE="http://www.kernel.org/
+	  http://www.namesys.com
+	  http://www.sistina.com/lvm/
+	  http://developer.intel.com/technology/iapc/acpi/"
+
+DEPEND=">=sys-apps/modutils-2.4.2 sys-devel/perl"
+#these deps are messed up; fix 'em and add ncurses (required my mosix compile, menuconfig)
+if [ $PN = "linux" ]
+then
+#	RDEPEND="mosix? ( ~sys-apps/mosix-user-${MOSV} ) >=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1"
+	RDEPEND=">=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1"
+elif [ $PN = "linux-sources" ]
+then
+	if [ "`use build`" ]
+	then
+		DEPEND=""
+		RDEPEND=""
+	else
+		#ncurses is required for "make menuconfig"
+		RDEPEND=">=sys-libs/ncurses-5.2"
+	fi
+elif [ $PN = "linux-extras" ]
+then
+	#linux-extras/headers requires a rev of the current kernel sources to be installed
+	RDEPEND="~sys-kernel/linux-sources-${PV}"
+elif [ $PN = "linux-headers" ]
+then
+	DEPEND=""
+	RDEPEND=""
+fi
+
+[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${KS}/include"
+
+patchorama() {
+	local x
+	for x in ${*} 
+	do
+		[ -d "$x" ] && continue
+		echo ">>> Applying ${x}..."
+		if [ "${x##*.}" = "bz2" ]
+		then
+			cat $x | bzip2 -d | patch -p1 -l
+		elif [ "${x##*.}" = "gz" ]
+  		then
+			cat $x | gzip -d | patch -p1 -l
+		else
+			patch -p1 -l < $x
+		fi
+	done
+}
+
+
+src_unpack() {
+
+	[ "$PN" = "linux-extras" ] && return
+	mkdir ${S2}
+
+	cd ${WORKDIR}
+	unpack linux-${OKV}.tar.bz2
+	mv linux linux-${KV} || die
+	dodir /usr/src/linux-${KV}-extras
+	cd ${KS2}
+	tar -xz --no-same-owner -f ${DISTDIR}/MOSIX-${MOSV}.tar.gz MOSIX-${MOSV}/patches.${OKV}
+	cd ${S}
+	patchorama ${KS2}/MOSIX-${MOSV}/patches.${OKV}
+	echo "Preparing for compilation..."
+	
+	#sometimes we have icky kernel symbols; this seems to get rid of them
+	make mrproper || die
+
+	#linux-sources needs to be fully configured, too.  Not just linux
+	#this is the configuration for the default kernel
+	cp ${S}/arch/i386/defconfig .config || die
+	yes "" | make oldconfig
+	echo "Ignore any errors from the yes command above."
+    
+	#fix silly permissions in tarball
+	cd ${WORKDIR}
+	chown -R 0.0 *
+	chmod -R a+r-w+X,u+w *
+
+	# Gentoo Linux uses /boot, so fix 'make install' to work properly
+	#seems they cant make up their mind if it should be a space or tab
+	cd ${S}
+	mv Makefile Makefile.orig
+	sed -e 's/#export\tINSTALL_PATH/export\tINSTALL_PATH/'		\
+		Makefile.orig >Makefile || die # test, remove me if Makefile ok
+	rm Makefile.orig
+}
+		
+src_compile() {
+
+	if [ "${PN}" = "linux-headers" ]
+	then
+		cd ${KS}
+		make include/linux/autoconf.h include/linux/version.h || die
+	elif [ "${PN}" = "linux-sources" ]
+	then
+		echo
+	else
+		if [ $PN = "linux" ]
+		then
+			cd ${KS}
+			make symlinks || die
+			make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" dep || die
+			make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" LEX="flex -l" bzImage || die
+			make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" LEX="flex -l" modules || die
+		fi
+		#LVM tools are included in the linux and linux-extras pakcages
+	#	cd ${KS2}/LVM/${LVMV}
+	#
+	#	# This is needed for linux-extras
+	#	if [ -f "Makefile" ]
+	#	then
+	#		make clean || die
+	#	fi
+	#	# I had to hack this in so that LVM will look in the current linux
+	#	# source directory instead of /usr/src/linux for stuff - pete
+	#	CFLAGS="${CFLAGS} -I${KS}/include" ./configure --prefix=/ --mandir=/usr/share/man --with-kernel_dir="${KS}" || die
+	#	make || die
+	fi
+}
+
+src_install() {
+
+	if [ "${PN}" = "linux" ] || [ "${PN}" = "linux-extras" ]
+	then
+	#	dodir /usr/lib
+	
+	#	cd ${KS2}/LVM/${LVMV}/tools
+	#	CFLAGS="${CFLAGS} -I${KS}/include" make install -e prefix=${D} mandir=${D}/usr/share/man sbindir=${D}/sbin libdir=${D}/lib || die
+		#no need for a static library in /lib
+	#	mv ${D}/lib/*.a ${D}/usr/lib
+	
+		if [ "${PN}" = "linux" ] 
+		then
+			dodir /usr/src/linux-${KV}
+			cd ${D}/usr/src
+			#grab includes and documentation only
+			echo ">>> Copying includes and documentation..."
+			cp -ax ${S}/include ${D}/usr/src/linux-${KV}
+			cp -ax ${S}/Documentation ${D}/usr/src/linux-${KV}
+	       
+			#grab compiled kernel
+			dodir /boot/boot
+			insinto /boot/boot
+			cd ${S}
+			doins arch/i386/boot/bzImage
+	    
+			#grab modules
+			# Do we have a bug in modutils ?
+			# Meanwhile we use this quick fix (achim)
+	    
+			install -d ${D}/lib/modules/`uname -r`
+			make INSTALL_MOD_PATH=${D} modules_install || die
+			
+			cd ${S}
+			depmod -b ${D} -F ${S}/System.map ${KV}	
+			#rm -rf ${D}/lib/modules/`uname -r`
+			#fix symlink
+			cd ${D}/lib/modules/${KV}
+			rm build
+			ln -sf /usr/src/linux-${KV} build
+		fi
+
+		cd ${KS2}/cloop-${CLOOPV}
+		insinto /lib/modules/${KV}/kernel/drivers/block
+		doins cloop.o
+		into /usr
+		dobin create_compressed_fs extract_compressed_fs
+		
+	elif [ "$PN" = "linux-sources" ]
+	then
+		dodir /usr/src
+		cd ${S}
+		echo ">>> Copying sources..."
+		cp -ax ${WORKDIR}/* ${D}/usr/src
+	elif [ "$PN" = "linux-headers" ]
+	then
+		dodir /usr/include/linux
+		cp -ax ${KS}/include/linux/* ${D}/usr/include/linux
+		dodir /usr/include/asm
+		cp -ax ${KS}/include/asm-i386/* ${D}/usr/include/asm
+	fi
+	if [ -d ${D}/usr/src/linux-${KV} ]
+	then
+		#don't overwrite existing .config if present
+		cd ${D}/usr/src/linux-${KV}
+		if [ -e .config ]
+		then
+			cp -a .config .config.eg
+		fi
+	fi
+}
+
+pkg_preinst() {
+
+	if [ "$PN" = "linux-headers" ]
+	then
+		if [ -L ${ROOT}usr/include/linux ]
+		then
+			rm ${ROOT}usr/include/linux
+		fi
+		if [ -L ${ROOT}usr/include/asm ]
+		then
+			rm ${ROOT}usr/include/asm
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if [ "$PN" = "linux-extras" ] || [ "$PN" = "linux-headers" ]
+	then
+		return
+	fi
+	rm -f ${ROOT}/usr/src/linux
+	ln -sf linux-${KV} ${ROOT}/usr/src/linux
+    
+	#copy over our .config if one isn't already present
+	cd ${ROOT}/usr/src/linux-${KV}
+	if [ "${PN}" = "linux-sources" ] && [ -e .config.eg ] && [ ! -e .config ]
+	then
+		cp -a .config.eg .config
+	fi
+}
diff --git a/sys-kernel/linux-sources/linux-sources-2.4.15_pre5.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.15_pre5.ebuild
index 72b2191b9eb1..1706b85fb9d9 100644
--- a/sys-kernel/linux-sources/linux-sources-2.4.15_pre5.ebuild
+++ b/sys-kernel/linux-sources/linux-sources-2.4.15_pre5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.15_pre5.ebuild,v 1.1 2001/11/18 20:02:37 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.15_pre5.ebuild,v 1.2 2001/11/24 01:53:25 drobbins Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -39,9 +39,6 @@ EXT3V=0.9.15
 LOWLV=2.4.15-pre5
 PREEV="${KV}-1"
 
-EXT3P="ext3-2.4-${EXT3V}-`echo ${KV} |sed -e 's:\.::g' -e 's:-::'`"
-
-[ "${PN}" = "linux" ] && DESCRIPTION="Linux kernel version ${KV}, including modules, binary tools, libraries and includes"
 [ "${PN}" = "linux-sources" ] && DESCRIPTION="Linux kernel version ${KV} - full sources"
 [ "${PN}" = "linux-extras" ] && DESCRIPTION="Linux kernel support tools and libraries"
 
@@ -61,31 +58,20 @@ HOMEPAGE="http://www.kernel.org/
 	  http://www.sistina.com/lvm/
 	  http://developer.intel.com/technology/iapc/acpi/"
 
-DEPEND=">=sys-apps/modutils-2.4.2 sys-devel/perl"
-#these deps are messed up; fix 'em and add ncurses (required my mosix compile, menuconfig)
-if [ $PN = "linux" ]
-then
-#	RDEPEND="mosix? ( ~sys-apps/mosix-user-${MOSV} ) >=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1"
-	RDEPEND=">=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1"
-elif [ $PN = "linux-sources" ]
+if [ $PN = "linux-sources" ]
 then
-	if [ "`use build`" ]
-	then
-		DEPEND=""
-		RDEPEND=""
-	else
-		#ncurses is required for "make menuconfig"
-		RDEPEND=">=sys-libs/ncurses-5.2"
-	fi
+	RDEPEND=">=sys-libs/ncurses-5.2"
 elif [ $PN = "linux-extras" ]
 then
-	#linux-extras/headers requires a rev of the current kernel sources to be installed
-	RDEPEND="~sys-kernel/linux-sources-${PV}"
-elif [ $PN = "linux-headers" ]
-then
-	DEPEND=""
-	RDEPEND=""
+	RDEPEND=">=sys-apps/e2fsprogs-1.22 \
+		>=sys-apps/util-linux-2.11f \
+		>=sys-apps/reiserfs-utils-3.6.25-r1 \
+		mosix? (~sys-apps/mosix-user-${MOSV} ) \
+		lvm? ( >=sys-apps/lvm-user-1.0.1_rc4 ) \
+		>=sys-apps/modutils-2.4.2"
+	DEPEND="~sys-kernel/linux-sources-${PV}"	
 fi
+#linux-headers depends on nothing.
 
 [ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${KS}/include"
 
@@ -120,15 +106,7 @@ src_unpack() {
 	dodir /usr/src/linux-${KV}-extras
 
 	cd ${S}
-	#patchorama ${DISTDIR}/ext3-2.4-${EXT3V}-2414.gz ${DISTDIR}/patch-${KV}.bz2 ${GFILESDIR}/2.4.15pre1aa1/* ${DISTDIR}/acpi-${ACPIV}.diff.gz
 	patchorama ${DISTDIR}/patch-${KV}.bz2 ${DISTDIR}/${LOWLV}-low-latency.patch.gz ${DISTDIR}/preempt-kernel-rml-2.4.15-pre4-1.patch
-	#echo ">>> Fixing up rejects..."
-	#cd ${GFILESDIR}/2.4.15pre1aa1-fixes
-	#cp array.c ${S}/fs/proc || die
-	#cp filemap.c ${S}/mm || die 
-	#cp sched.h ${S}/include/linux || die
-	#cp fs.h ${S}/include/linux || die
-	#cp low-latency.h ${S}/include/linux || die
 	
 	echo "Preparing for compilation..."
 	cd ${S}
@@ -165,79 +143,12 @@ src_compile() {
 	elif [ "${PN}" = "linux-sources" ]
 	then
 		echo
-	else
-		if [ $PN = "linux" ]
-		then
-			cd ${KS}
-			make symlinks || die
-			make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" dep || die
-			make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" LEX="flex -l" bzImage || die
-			make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" LEX="flex -l" modules || die
-		fi
-		#LVM tools are included in the linux and linux-extras pakcages
-		cd ${KS2}/LVM/${LVMV}
-	
-		# This is needed for linux-extras
-		if [ -f "Makefile" ]
-		then
-			make clean || die
-		fi
-		# I had to hack this in so that LVM will look in the current linux
-		# source directory instead of /usr/src/linux for stuff - pete
-		CFLAGS="${CFLAGS} -I${KS}/include" ./configure --prefix=/ --mandir=/usr/share/man --with-kernel_dir="${KS}" || die
-		make || die
 	fi
+	#all of linux-extras compilation is now external (in other packages)
 }
 
 src_install() {
-
-	if [ "${PN}" = "linux" ] || [ "${PN}" = "linux-extras" ]
-	then
-		dodir /usr/lib
-	
-		cd ${KS2}/LVM/${LVMV}/tools
-		CFLAGS="${CFLAGS} -I${KS}/include" make install -e prefix=${D} mandir=${D}/usr/share/man sbindir=${D}/sbin libdir=${D}/lib || die
-		#no need for a static library in /lib
-		mv ${D}/lib/*.a ${D}/usr/lib
-	
-		if [ "${PN}" = "linux" ] 
-		then
-			dodir /usr/src/linux-${KV}
-			cd ${D}/usr/src
-			#grab includes and documentation only
-			echo ">>> Copying includes and documentation..."
-			cp -ax ${S}/include ${D}/usr/src/linux-${KV}
-			cp -ax ${S}/Documentation ${D}/usr/src/linux-${KV}
-	       
-			#grab compiled kernel
-			dodir /boot/boot
-			insinto /boot/boot
-			cd ${S}
-			doins arch/i386/boot/bzImage
-	    
-			#grab modules
-			# Do we have a bug in modutils ?
-			# Meanwhile we use this quick fix (achim)
-	    
-			install -d ${D}/lib/modules/`uname -r`
-			make INSTALL_MOD_PATH=${D} modules_install || die
-			
-			cd ${S}
-			depmod -b ${D} -F ${S}/System.map ${KV}	
-			#rm -rf ${D}/lib/modules/`uname -r`
-			#fix symlink
-			cd ${D}/lib/modules/${KV}
-			rm build
-			ln -sf /usr/src/linux-${KV} build
-		fi
-
-		cd ${KS2}/cloop-${CLOOPV}
-		insinto /lib/modules/${KV}/kernel/drivers/block
-		doins cloop.o
-		into /usr
-		dobin create_compressed_fs extract_compressed_fs
-		
-	elif [ "$PN" = "linux-sources" ]
+	if [ "$PN" = "linux-sources" ]
 	then
 		dodir /usr/src
 		cd ${S}