Changed ebuilds so they work better with newer portage versions

6 files changed, 27 insertions, 93 deletions

diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index 0f9a3bbae54c..75d4a66a8aa8 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.26 2003/06/22 21:55:02 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.27 2003/07/23 09:48:02 joker Exp $
+
+  23 Jul 2003; Christian Birchinger <joker@gentoo.org>
+  sparc-sources-2.4.20-r8.ebuild, sparc-sources-2.4.21-r1.ebuild:
+  Fixed ebuilds so they work with newer portage versions
 
 *sparc-sources-2.4.21-r1 (22 Jun 2003)
 
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index 2c5b610297ec..801fd51b67ca 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,15 +1,13 @@
-MD5 cab7d0ff33190f5f37488e232c1673c2 ChangeLog 4917
+MD5 7f10072d665c3fa33f86922b2c6fa9d4 ChangeLog 5096
 MD5 b301ca9ef152c622be6b90d0042667fc sparc-sources-2.2.21_pre3.ebuild 5119
-MD5 5f076c528d13a2b1831442ec34d16d82 sparc-sources-2.4.21-r1.ebuild 2031
-MD5 0ba0dfcfaf13605128778bd9430c5714 sparc-sources-2.4.21.ebuild 2034
-MD5 7fcb8fc747dadd893373e29a97146668 sparc-sources-2.4.20-r8.ebuild 2195
+MD5 89492fdcc0476c7842be674b8cde969c sparc-sources-2.4.20-r8.ebuild 2139
+MD5 37d831f3e62b2bb345e9df751a72dcc2 sparc-sources-2.4.21-r1.ebuild 1972
+MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
 MD5 167e790d7861e0ed3a31577b31a92968 files/digest-sparc-sources-2.2.21_pre3 281
+MD5 5cc2d0aaf480b0f39d42e04133d4138a files/digest-sparc-sources-2.4.20-r8 143
+MD5 78fb563990b579b7408f77a65ca176a0 files/digest-sparc-sources-2.4.21-r1 143
 MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
 MD5 707798c011eaadc59870bfbe99d10c2b files/sparc-asm_offsets.h 23000
 MD5 1bdf35eda3b09561cc6de12735d5c968 files/sparc64-asm_offsets.h 35287
-MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
-MD5 78fb563990b579b7408f77a65ca176a0 files/digest-sparc-sources-2.4.21-r1 143
-MD5 256442a083cf945a5aa391587d293cdf files/digest-sparc-sources-2.4.21 140
-MD5 5cc2d0aaf480b0f39d42e04133d4138a files/digest-sparc-sources-2.4.20-r8 143
-MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
 MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
+MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.21 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.21
deleted file mode 100644
index d951c7749eb6..000000000000
--- a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.21
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 f08469796ebe063efaed6c29e451138f patches-2.4.21-sparc.tar.bz2 138713
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild
index 81dcf5ba02a3..2fc13a009a18 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild
@@ -1,12 +1,10 @@
 # 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-sources/sparc-sources-2.4.20-r8.ebuild,v 1.3 2003/07/22 20:00:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild,v 1.4 2003/07/23 09:48:02 joker Exp $
 
 IUSE="build ultra1"
 
-# OKV=original kernel version, KV=patched kernel version.  They can be the
-# same.
-KV=${PV}
+# 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
@@ -23,24 +21,23 @@ KV=${PV}
 
 ETYPE="sources"
 
-inherit kernel
-
+inherit kernel || die
+OKV="2.4.20"
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/sparc-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-${PVR}-sparc.tar.bz2"
+	
 KEYWORDS="~x86 -ppc sparc"
 SLOT="${KV}"
 
 src_unpack() {
 	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
+	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	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!
+	cd ${WORKDIR}/${KV}
 
 	kernel_src_unpack
 
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild
index af11734d8df2..59e5a5e47dfd 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild
@@ -1,12 +1,10 @@
 # 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-sources/sparc-sources-2.4.21-r1.ebuild,v 1.2 2003/07/22 20:00:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild,v 1.3 2003/07/23 09:48:02 joker Exp $
 
 IUSE="build ultra1"
 
-# OKV=original kernel version, KV=patched kernel version.  They can be the
-# same.
-KV=${PV}
+# 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
@@ -19,24 +17,22 @@ KV=${PV}
 
 ETYPE="sources"
 
-inherit kernel
-
+inherit kernel || die
+OKV="2.4.21"
 # Documentation on the patches contained in this kernel will be installed
 # to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz
 
 DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="~x86 -ppc ~sparc"
+
+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!
+	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
+	cd ${WORKDIR}/${KV}
 
 	kernel_src_unpack
 
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.21.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.21.ebuild
deleted file mode 100644
index bb168af6d66d..000000000000
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.21.ebuild
+++ /dev/null
@@ -1,59 +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/sparc-sources/sparc-sources-2.4.21.ebuild,v 1.5 2003/07/22 20:00:34 vapier Exp $
-
-IUSE="build ultra1"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the
-# same.
-KV=${PV}
-
-# 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
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://gentoo/patches-${PVR}-sparc.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!
-
-	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"
-		einfo
-	fi
-}