Bump to 2.6.0 final.

4 files changed, 80 insertions, 3 deletions

diff --git a/sys-kernel/sparc-dev-sources/ChangeLog b/sys-kernel/sparc-dev-sources/ChangeLog
index 1ad4c8dba7bc..b4ec04b618a9 100644
--- a/sys-kernel/sparc-dev-sources/ChangeLog
+++ b/sys-kernel/sparc-dev-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/sparc-dev-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-dev-sources/ChangeLog,v 1.1 2003/12/15 03:21:12 wesolows Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-dev-sources/ChangeLog,v 1.2 2003/12/20 07:29:43 wesolows Exp $
+
+  19 Dec 2003; Keith M Wesolowski <wesolows@gentoo.org> :
+  Bump to 2.6.0.
+  Add bootmsg patch for cosmetic fixes.
+  Add EXTRAVERSION.
+  Add description for no-sparc32-aout patch.
 
 *sparc-dev-sources-2.6.0_beta11 (14 Dec 2003)
 
diff --git a/sys-kernel/sparc-dev-sources/Manifest b/sys-kernel/sparc-dev-sources/Manifest
index 9e78c9ebca8d..b075e1205fa9 100644
--- a/sys-kernel/sparc-dev-sources/Manifest
+++ b/sys-kernel/sparc-dev-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 9aebe1330d11bc57a2e03942f2fc973a ChangeLog 670
+MD5 08e36f660a6722d8da0c752dcbab92ca ChangeLog 670
 MD5 a4a4e3febcacb7664d2bec3a8688a130 metadata.xml 454
 MD5 4b22dee29c8fe774f6237709e6a3abad sparc-dev-sources-2.6.0_beta11.ebuild 2310
-MD5 806522564c4b2f39b4819bc8ae62a1b6 sparc-dev-sources-2.6.0.ebuild 2360
+MD5 02662a07fcbaf1de3430c109844dbfc8 sparc-dev-sources-2.6.0.ebuild 2353
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
 MD5 fb4fce3b5a4c112344c12703061949a7 files/digest-sparc-dev-sources-2.6.0 137
 MD5 a984a556d93ffaf4f43336ad6a6e5f1e files/digest-sparc-dev-sources-2.6.0_beta11 151
diff --git a/sys-kernel/sparc-dev-sources/files/digest-sparc-dev-sources-2.6.0 b/sys-kernel/sparc-dev-sources/files/digest-sparc-dev-sources-2.6.0
new file mode 100644
index 000000000000..ee008977bdc0
--- /dev/null
+++ b/sys-kernel/sparc-dev-sources/files/digest-sparc-dev-sources-2.6.0
@@ -0,0 +1,2 @@
+MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
+MD5 4107cc64cc3e0787917c6a6cf3972ec6 patches-2.6.0-sparc.tar.bz2 46577
diff --git a/sys-kernel/sparc-dev-sources/sparc-dev-sources-2.6.0.ebuild b/sys-kernel/sparc-dev-sources/sparc-dev-sources-2.6.0.ebuild
new file mode 100644
index 000000000000..852928c71985
--- /dev/null
+++ b/sys-kernel/sparc-dev-sources/sparc-dev-sources-2.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-dev-sources/sparc-dev-sources-2.6.0.ebuild,v 1.1 2003/12/20 07:29:43 wesolows Exp $
+
+IUSE="ultra1"
+
+# 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="grsecurity" would not patch any patches whose names match
+# *grsecurity*).  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
+
+#Original Kernel Version before Patches
+# eg: 2.6.0-test11
+OKV=${PV/_beta/-test}
+OKV=${OKV/-r*//}
+
+#Kernel version after patches
+# eg: 2.6.0-test8-bk1
+KV=${PV/_beta/-test}
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${KV}${EXTRAVERSION}"
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/sparc-sources-dev-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the Gentoo Sparc Linux development kernel"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+	mirror://gentoo/patches-${KV}.tar.bz2"
+
+S=${WORKDIR}/linux-${KV}
+KEYWORDS="~x86 -ppc ~sparc"
+SLOT="${KV}"
+
+DEPEND="${DEPEND} sys-apps/module-init-tools"
+[ `uname -m` = "sparc64" ] && DEPEND="${DEPEND} >=sys-devel/gcc-sparc64-3.2.3"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
+	cd ${KV} || die "Unable to cd into ${KV}"
+
+	kernel_src_unpack
+
+	# Patch the HME driver only on Ultra1 machines.
+	use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch
+}
+
+pkg_postinst() {
+
+	kernel_pkg_postinst
+
+	# Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown.
+	if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then
+		einfo
+		einfo "For users with an Enterprise model Ultra 1 using the HME network interface,"
+		einfo "please emerge the kernel using the following command:"
+		einfo
+		einfo "USE=ultra1 emerge sparc-sources-dev"
+		einfo
+	fi
+}