bring development-sources back to vanilla

3 files changed, 16 insertions, 25 deletions

diff --git a/sys-kernel/development-sources/ChangeLog b/sys-kernel/development-sources/ChangeLog
index 65f7dcb17767..352574d847f6 100644
--- a/sys-kernel/development-sources/ChangeLog
+++ b/sys-kernel/development-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/development-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/ChangeLog,v 1.56 2003/10/26 20:03:44 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/ChangeLog,v 1.57 2003/11/02 18:18:00 brad_mssw Exp $
+
+  02 Nov 2003; Brad House <brad_mssw@gentoo.org>
+  development-sources-2.6.0_beta9.ebuild:
+  bring development-sources back to vanilla
 
   26 Oct 2003; Brad House <brad_mssw@gentoo.org>
   development-sources-2.6.0_beta9.ebuild:
diff --git a/sys-kernel/development-sources/Manifest b/sys-kernel/development-sources/Manifest
index fb0469a38f67..47beb7ef8e81 100644
--- a/sys-kernel/development-sources/Manifest
+++ b/sys-kernel/development-sources/Manifest
@@ -1,14 +1,14 @@
-MD5 4983bf993097d15e5667281c1cda9f7e ChangeLog 10721
+MD5 a79f43549eb6f6cda8715e772281b29b ChangeLog 10857
+MD5 e8f7ef9b4384ad2c26066eafdd7bfece development-sources-2.6.0_beta9.ebuild 3703
 MD5 f900f573cbb274ee4774d696a3081364 development-sources-2.6.0_beta7-r2.ebuild 3281
 MD5 06f2893907e8728d6c6891df493dc091 development-sources-2.6.0_beta7-r3.ebuild 3281
-MD5 604d42c212f50361df9694448b7a3bdb development-sources-2.6.0_beta7-r5.ebuild 3533
 MD5 8c452d7b6c23332d3dbfd10fdf3d28a8 development-sources-2.6.0_beta7.ebuild 3277
-MD5 fd51ed408069086c547feaed84757e94 development-sources-2.6.0_beta8.ebuild 4047
-MD5 34c8b1ca696a2164558158c140b8cc98 development-sources-2.6.0_beta9.ebuild 4043
 MD5 854abf2bdb617fe8c7de18312a60bb85 metadata.xml 442
+MD5 604d42c212f50361df9694448b7a3bdb development-sources-2.6.0_beta7-r5.ebuild 3533
+MD5 fd51ed408069086c547feaed84757e94 development-sources-2.6.0_beta8.ebuild 4047
+MD5 8bee3796dcdcaf844806c015cd8f9e4c files/digest-development-sources-2.6.0_beta9 142
 MD5 c89934022d76ba15351646073fa260b8 files/digest-development-sources-2.6.0_beta7 72
 MD5 ce48c553976e08231fcdb58faa02517d files/digest-development-sources-2.6.0_beta7-r2 141
 MD5 eed41ceb58615452740b71330342ab0d files/digest-development-sources-2.6.0_beta7-r3 142
 MD5 9824da01b9169b0253ec532e1169b430 files/digest-development-sources-2.6.0_beta7-r5 218
 MD5 159bd39720276be321a3e23ad6a53a6e files/digest-development-sources-2.6.0_beta8 142
-MD5 8bee3796dcdcaf844806c015cd8f9e4c files/digest-development-sources-2.6.0_beta9 142
diff --git a/sys-kernel/development-sources/development-sources-2.6.0_beta9.ebuild b/sys-kernel/development-sources/development-sources-2.6.0_beta9.ebuild
index a1ae0532d710..647511068843 100644
--- a/sys-kernel/development-sources/development-sources-2.6.0_beta9.ebuild
+++ b/sys-kernel/development-sources/development-sources-2.6.0_beta9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/development-sources-2.6.0_beta9.ebuild,v 1.3 2003/10/26 20:03:44 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/development-sources/development-sources-2.6.0_beta9.ebuild,v 1.4 2003/11/02 18:18:00 brad_mssw Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 #Original Kernel Version before Patches
@@ -14,22 +14,15 @@ KV=${PF/_beta/-test}
 KV=${KV/-r/-bk}
 KV=${KV//${PN}-}
 
-#version of gentoo patchset
-# eg: 2.6.0-test8-r1-patchset-1
-# this gets added on right at the end before it links
-# if you dont want to apply these patches, set GPV=0
-[ ! $(use vanilla) ] && GPV=0.2
-
 S=${WORKDIR}/linux-${OKV}
 ETYPE="sources"
 
-IUSE="vanilla"
+IUSE=""
 DESCRIPTION="Full sources for the Development Branch of the Linux kernel"
 
-[ ! ${GPV} == 0 ] && GPATCH_URI="mirror://gentoo/distfiles/genpatches-2.6-${GPV}.tar.bz2"
 [ -z ${KV/*-bk*/} ] && PATCH_URI="http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-${KV}.bz2"
 
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 ${PATCH_URI} ${GPATCH_URI}"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 ${PATCH_URI}"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
@@ -58,13 +51,6 @@ src_unpack() {
 		epatch ${DISTDIR}/patch-${KV}.bz2
 	fi
 
-	# apply gentoo patches	
-	if [ ! ${GPV} == 0 ]
-	then
-		epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
-		KV="${KV}-patchset-${GPV}"
-	fi
-
 	# move to appropriate src dir
 	if [ ! ${KV} == ${OKV} ]
 	then
@@ -118,7 +104,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	[ "$ETYPE" = "headers" ] && return
-	[ ! ${GPV} == 0 ] && KV="${KV}-patchset-${GPV}"
 	[ ! -e ${ROOT}usr/src/linux-beta ] && ln -sf linux-${KV} ${ROOT}/usr/src/linux-beta
 
 	echo
@@ -135,6 +120,8 @@ pkg_postinst() {
 	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""
 	ewarn "error."
 	echo
-	ewarn "PLEASE NOTE THIS IS NOT OFFICIALLY SUPPORTED BY GENTOO."
+	einfo "Please note that if you are looking for a version of the 2.6 sources"
+	einfo "that has been tested on Gentoo, please use sys-kernel/gentoo-dev-sources"
+	einfo "as this version has been deprecated back to vanilla."
 	sleep 5
 }