cleanup in prep for 2.6.2. marking 2.6.1-r1 stable

5 files changed, 10 insertions, 161 deletions

diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index 5c132b2cc1e1..0577ed0df398 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.31 2004/01/24 20:43:22 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.32 2004/02/05 13:32:47 johnm Exp $
+
+  05 Feb 2004; John Mylchreest <johnm@gentoo.org>
+  gentoo-dev-sources-2.6.1-r1.ebuild, gentoo-dev-sources-2.6.1.ebuild:
+  tidy up ready for 2.6.2, marking stable 2.6.1-r1
 
 *gentoo-dev-sources-2.6.2_rc1 (24 Jan 2004)
 
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index 2a58d3a7f992..44b7e2f660bf 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,12 +1,8 @@
-MD5 2ed9666ecb1a2a6b4a7d6b4cb3c89bbd ChangeLog 6587
-MD5 b9d0498e390181d4d54f621aeb83b460 gentoo-dev-sources-2.6.1-r1.ebuild 2189
 MD5 a90950a202a2c27350038385721b1461 gentoo-dev-sources-2.6.2_rc1.ebuild 2365
-MD5 bb4d67e58a7a9ecd9069931f3c49dcc6 gentoo-dev-sources-2.6.1_rc2.ebuild 4103
 MD5 813135a1199ca9450ac9a3ef14e9da04 gentoo-dev-sources-2.6.1_rc3.ebuild 4103
-MD5 cd1ecd18f5866d7091f7f47c25ab8c65 gentoo-dev-sources-2.6.1.ebuild 4099
+MD5 a1962ceb66a56f4c373e1470843d7492 gentoo-dev-sources-2.6.1-r1.ebuild 2213
+MD5 bb4d67e58a7a9ecd9069931f3c49dcc6 gentoo-dev-sources-2.6.1_rc2.ebuild 4103
+MD5 72fd6bed50c686d140df317545462d22 ChangeLog 6756
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
 MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r1 138
 MD5 3761ed14b3fd6021a8d1dbdb8c6cea7e files/digest-gentoo-dev-sources-2.6.2_rc1 203
-MD5 11f11e1b2cae7428596558dd3c9a7635 files/digest-gentoo-dev-sources-2.6.1_rc2 202
-MD5 4838415b41e807f05b35b5efd8cfcb95 files/digest-gentoo-dev-sources-2.6.1_rc3 202
-MD5 1afc82248866f1db6529bdb8296d59e1 files/digest-gentoo-dev-sources-2.6.1 138
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1
deleted file mode 100644
index a92164c53dc1..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
-MD5 f6711a9c836d8e86285e3c21c52409f7 genpatches-2.6-1.15.tar.bz2 530239
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild
index 9f0c50a6a397..e4bb7e0f3d5e 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild,v 1.3 2004/01/13 22:35:35 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild,v 1.4 2004/02/05 13:32:47 johnm Exp $
 
 # As this is the example source to use kernel-2.eclass then a very brief explanation is to go here
 #
@@ -32,7 +32,7 @@ detect_version
 DESCRIPTION="Full sources including the gentoo patchset for the 2.6 kernel tree"
 SRC_URI="${KERNEL_URI} ${GPV_SRC}"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~mips ~hppa ~sparc ~alpha"
 
 pkg_postinst() {
 	postinst_sources
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1.ebuild
deleted file mode 100644
index 69200a6407d8..000000000000
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1.ebuild,v 1.1 2004/01/09 16:25:31 brad_mssw Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-# Kernel Version before Gentoo Patches
-TKV=${PV/-r*/}
-OKV=${TKV/_rc/-rc}
-OKV=${OKV/_pre/-bk}
-
-KVONLY=${OKV/-*/}
-KEXT=${TKV/${KVONLY}/}
-KMAJ=`echo ${KVONLY} | cut -d. -f1`
-KMIN=`echo ${KVONLY} | cut -d. -f2`
-KREL=`echo ${KVONLY} | cut -d. -f3`
-
-# Kernel Version before official Patches
-if [ "${KEXT}" = "" ]
-then
-	OFFICIAL_KV=${KVONLY}
-else
-	OFFICIAL_KV="${KMAJ}.${KMIN}.`expr ${KREL} - 1`"
-fi
-
-#version of gentoo patchset
-# set to 0 for no patchset
-GPV=1.15
-
-[ ${PR} == "r0" ] && EXTRAVERSION="-gentoo" || EXTRAVERSION="-gentoo-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-
-if [ "${GPV}" != "0" ]
-then
-	GPV_SRC="http://dev.gentoo.org/~brad_mssw/kernel_patches/DO_NOT_UPLOAD_TO_MIRRORS_WITHOUT_ASKING_ME_FIRST/genpatches-2.6-${GPV}.tar.bz2"
-#	GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
-fi
-if [ "${KEXT}" != "" ]
-then
-	KP_SRC="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
-fi
-
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OFFICIAL_KV}.tar.bz2
-	${KP_SRC}
-	${GPV_SRC}"
-LICENSE="GPL-2"
-SLOT="${KV}"
-#KEYWORDS="-*"
-KEYWORDS="-* x86 amd64 ~mips ~hppa ~sparc ~alpha"
-PROVIDE="virtual/linux-sources virtual/alsa"
-#RESTRICT="nomirror"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-src_unpack() {
-
-	cd ${WORKDIR}
-
-	if [ "${GPV}" != "0" ]
-	then
-		unpack genpatches-2.6-${GPV}.tar.bz2
-	fi
-	unpack linux-${OFFICIAL_KV}.tar.bz2
-	mv linux-${OFFICIAL_KV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
-
-	if [ "${KEXT}" != "" ]
-	then
-		epatch "${DISTDIR}/patch-${OKV}.bz2"
-	fi
-
-	if [ "${GPV}" != "0" ]
-	then
-		# apply gentoo patches
-		# epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-		PATCHES=`find ${WORKDIR}/genpatches-2.6-${GPV} -type f -name *.patch | sort`
-		for file in ${PATCHES}
-		do
-			epatch $file
-		done
-	fi
-
-	# Our EXTRAVERSION needs to be appended to the end for the Makefile
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	-e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1${EXTRAVERSION}:" Makefile > Makefile.new
-
-#	rm -f Makefile
-#	mv Makefile.new Makefile
-
-	kernel_universal_unpack
-
-	# Working around a bug in kernel.eclass, move the .new file after universal_unpack
-	rm -f Makefile
-	mv Makefile.new Makefile
-}
-
-pkg_install() {
-	kernel_src_install
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	if [ ! -h "/usr/src/linux-beta" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux-beta
-	fi
-
-	if [ ! -h "/usr/src/linux" ]
-	then
-		ln -sf /usr/src/linux-${KV} ${ROOT}/usr/src/linux
-	fi
-
-	# Don't forget to make directory for sysfs
-	if [ ! -d "/sys" ]
-	then
-		mkdir /sys
-	fi
-
-	echo
-	ewarn "Please note that ptyfs support has been removed from devfs"
-	ewarn "and you have to compile it in now, or else you will get"
-	ewarn "errors when trying to open a pty. The options are:"
-	ewarn "Device Drivers -> Character devices -> Unix98 PTY support and"
-	ewarn "File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	ewarn "Also, note that you must compile in support for"
-	ewarn "input devices (Input device support->Input devices),"
-	ewarn "the virtual terminal (Character Devices->Virtual terminal),"
-	ewarn "vga_console (Graphics Support->Console...->VGA text console)"
-	ewarn "and the vt_console (Character Devices->Support for console...)."
-	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""
-	ewarn "error."
-	echo
-}