drop extra featurs, and switch to new genpaches style

(Portage version: 2.0.51.19)

4 files changed, 15 insertions, 55 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index d48d2da5ffc5..19bf4acc8b8f 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.103 2005/06/22 17:41:21 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.104 2005/06/22 18:46:26 marineam Exp $
+
+  22 Jun 2005; Michael Marineau <marineam@gentoo.org>
+  ck-sources-2.6.12_p2.ebuild:
+  Drop the vesafb-tng and inotify patches again, use gentoo-sources or patch
+  it yourself if you want these.
 
 *ck-sources-2.6.12_p2 (22 Jun 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index ae1b83b281df..c2fb1d683826 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8b3d24606358ce61db7950c4b3d48224 ck-sources-2.6.12_p2.ebuild 2282
+MD5 f11bd96bf1c477798c307fbf5baaac5f ck-sources-2.6.12_p2.ebuild 1378
 MD5 5d69e1de26377a9e0a4211e2c24ba046 ck-sources-2.6.11_p10.ebuild 1970
 MD5 a07adfea504510fc6eaa09381d2541b2 ChangeLog 23521
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 cabf179e8073c4391a13f9c32148755a files/digest-ck-sources-2.6.11_p10 281
-MD5 c870982320df94050ffc39bba4279b69 files/digest-ck-sources-2.6.12_p2 357
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCuaLZnVkA0cTr1F4RAqtMAKCDZrK6aUsZco6CdF33mivxx0T3AgCeIumU
-odaTAJfUbQp7mIvG/fdwsfg=
-=oxTW
------END PGP SIGNATURE-----
+MD5 87d851f771950b7d9dcc0f72a6a344c6 files/digest-ck-sources-2.6.12_p2 202
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild
index 96062f0256c1..fcfa03489270 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild,v 1.1 2005/06/22 17:41:21 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild,v 1.2 2005/06/22 18:46:26 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
-
 K_NOUSENAME="yes"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="1"
 ETYPE="sources"
-inherit kernel-2 eutils
+inherit kernel-2
 detect_version
 
 # A few hacks to set ck version via _p instead of -r
@@ -17,6 +18,7 @@ MY_PR=${MY_PR/-r0/}
 EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
 KV_FULL=${OKV}${EXTRAVERSION}
 KV_CK=${KV_FULL/-r*/}
+detect_version
 
 IUSE="ck-server"
 if use ck-server; then
@@ -25,51 +27,16 @@ else
 	CK_PATCH="patch-${KV_CK}.bz2"
 fi
 
-#version of gentoo patchset
-GPV="12-1"
-GPV_VESAFB="4505_vesafb-tng-0.9-rc6-r2.patch"
-GPV_INOTIFY="4800_inotify-0.23-12.patch"
-GPV_BASE="genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2"
-GPV_EXTRA="genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.extras.tar.bz2"
-GPV_SRC="mirror://gentoo/${GPV_BASE} mirror://gentoo/${GPV_EXTRA}"
-
-UNIPATCH_LIST="
-	${DISTDIR}/${CK_PATCH}
-	${DISTDIR}/${GPV_BASE}"
-
-UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
-	10" #All of the 2.6.x.y patches (already in ck) start with 10
-
-UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}/0000_README"
+UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
 
 DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset"
 HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="${KERNEL_URI} ${GPV_SRC}
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
 	ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}-server.bz2 )
 	!ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
 
 KEYWORDS="~x86 ~amd64"
 
-src_unpack() {
-	kernel-2_src_unpack
-
-	cd ${WORKDIR}
-	unpack ${GPV_EXTRA}
-
-	cd ${S}
-	epatch ${WORKDIR}/${OKV}/${GPV_VESAFB}
-	epatch ${WORKDIR}/${OKV}/${GPV_INOTIFY}
-}
-
-# Left out for now because ck-sources isn't keyworded for sparc
-# (from gentoo-sources)
-#pkg_setup() {
-#	if use sparc; then
-#		# hme lockup hack on ultra1
-#		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
-#	fi
-#}
-
 pkg_postinst() {
 	postinst_sources
 
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2
index 385906e390c1..ef9f3a0f55c7 100644
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2
@@ -1,5 +1,3 @@
 MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 b3614035f9892f8976ba9796138c40d6 genpatches-2.6.12-1.base.tar.bz2 15970
-MD5 38ec8ac0e1c9dcdb800d5e864b9fc447 genpatches-2.6.12-1.extras.tar.bz2 120119
 MD5 f0be9fd59e692f3c4c5fddecd9239b2b patch-2.6.12-ck2-server.bz2 39826
 MD5 cbc1df125bb7d57796a800242309a80f patch-2.6.12-ck2.bz2 39907