Lots of fixes, see changelog

(Portage version: 1.589-cvs)

5 files changed, 54 insertions, 42 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index bbca62170734..02108bb8d3b6 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.173 2005/07/24 15:56:43 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.174 2005/07/30 19:53:25 dsd Exp $
+
+*gentoo-sources-2.6.12-r7 (30 Jul 2005)
+
+  30 Jul 2005; Daniel Drake <dsd@gentoo.org>
+  -gentoo-sources-2.6.10-r6.ebuild, +gentoo-sources-2.6.12-r7.ebuild:
+  Support network on iMac G5
+  Support Promise TX4200 SATA
+  Fix touchpad on Alienware sentia
+  Fix matroxfb vs fbsplash conflict
+  Fix bringing up of VLANs
+  Fix gconfig crash
+  Fix powernow oops on dual-core athlon
+  Fix possible bio-clone corruption
+  Fix qla2xxx failure handling
+  Fix network skb signedness problem
+  Fix elf-related memory leak on AMD64
+  Fix possible overflow in IPSEC policy code
+  Fix possible corruption in memory NAT
+  Fix possible deadlock in ipv6
+  Fix crash on conntrac unload
 
   24 Jul 2005; <plasmaroo@gentoo.org> gentoo-sources-2.6.12-r6.ebuild:
   Stable on IA64.
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 75ac82b0abec..4228407e1f4a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,33 +1,33 @@
-MD5 77d5783bed87134378d7b13340995a9d ChangeLog 45346
-MD5 386b6b1084b1c4cabfad87fc8b603114 gentoo-sources-2.6.10-r6.ebuild 1607
-MD5 410c3afeb274354a7ce68257edc18012 metadata.xml 283
-MD5 2d2150ca2b1b3db3d469a5a2356161fb gentoo-sources-2.6.9-r9.ebuild 1625
-MD5 8573f612a6e55cbf9f6c7864148f117c gentoo-sources-2.4.31-r1.ebuild 669
-MD5 e935e807cb37104cc7670ccdc49fb975 gentoo-sources-2.4.28-r9.ebuild 1412
 MD5 be97a817a9eb12c992b1b0fd15a6999d gentoo-sources-2.6.12-r4.ebuild 1230
+MD5 e935e807cb37104cc7670ccdc49fb975 gentoo-sources-2.4.28-r9.ebuild 1412
 MD5 e83320266b74eb4ab627e8492afc85cb gentoo-sources-2.6.12-r6.ebuild 1231
-MD5 3f8d2e3d28369e95a59804dbf9a9132b files/gentoo-sources-2.4.81195.patch 11448
-MD5 d1ccc2047be533c992f67270a150a210 files/gentoo-sources-2.4.cmdlineLeak.patch 388
-MD5 03fa0238a07d103d2ccb9c8b01f88326 files/digest-gentoo-sources-2.6.10-r6 224
-MD5 b9a94233e1457787352e5f85e3e3582d files/gentoo-sources-2.4.binfmt_a.out.patch 2009
+MD5 8573f612a6e55cbf9f6c7864148f117c gentoo-sources-2.4.31-r1.ebuild 669
+MD5 2d2150ca2b1b3db3d469a5a2356161fb gentoo-sources-2.6.9-r9.ebuild 1625
+MD5 21aa25d665cd86386c8d57c16277f1b9 gentoo-sources-2.6.12-r7.ebuild 1229
+MD5 77d5783bed87134378d7b13340995a9d ChangeLog 45346
+MD5 410c3afeb274354a7ce68257edc18012 metadata.xml 283
+MD5 29e531cdd3f2effce5e31a1f2afb5b5d files/gentoo-sources-2.4.28.brk-locked.patch 8912
+MD5 8c35751caf824a9dacb02e80d6189b2e files/gentoo-sources-2.4.CAN-2004-1137.patch 1764
+MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/gentoo-sources-2.4.CAN-2004-1016.patch 2835
 MD5 4120a11b06ed6042ad4cb29de19b011c files/gentoo-sources-2.4.81295.patch 8526
-MD5 1cd653d48c2ece7fbb55c16134288362 files/digest-gentoo-sources-2.6.9-r9 221
-MD5 1efe4024e443e60db5fd9b21b22fabd2 files/gentoo-sources-2.4.77666.patch 1724
-MD5 792fa9165e5ae65d46ee206c7f7a4fc9 files/gentoo-sources-2.4.78363.patch 788
-MD5 1d78b90e495e432432e095ee47bbc2fc files/gentoo-sources-2.4.77094.patch 452
+MD5 b1f723b1661a3fcbe79e921ddfe40584 files/gentoo-sources-2.4.PaX-84167.patch 1202
+MD5 0f93b46ae17cbd0fc9b4d1cf5d704296 files/gentoo-sources-2.4.81106.patch 2243
+MD5 0c2bca31a62192779bf6129b3b23238b files/gentoo-sources-2.4.28.arpFix.patch 1021
 MD5 6ed89b8ac0b47a4c25d3a616ef9245cc files/gentoo-sources-2.4.vma.patch 11369
 MD5 6faf43bc1de5775e68cde4e6d2c2a76b files/gentoo-sources-2.4.82201.patch 480
-MD5 8c35751caf824a9dacb02e80d6189b2e files/gentoo-sources-2.4.CAN-2004-1137.patch 1764
+MD5 b6cd2468a246169a6e2f969c44e3f341 files/gentoo-sources-2.4.78362.patch 10372
+MD5 757ee1239c3f14645ccea3640d551e11 files/gentoo-sources-2.4.CAN-2004-1056.patch 11249
+MD5 1efe4024e443e60db5fd9b21b22fabd2 files/gentoo-sources-2.4.77666.patch 1724
+MD5 3f8d2e3d28369e95a59804dbf9a9132b files/gentoo-sources-2.4.81195.patch 11448
+MD5 1d78b90e495e432432e095ee47bbc2fc files/gentoo-sources-2.4.77094.patch 452
+MD5 792fa9165e5ae65d46ee206c7f7a4fc9 files/gentoo-sources-2.4.78363.patch 788
 MD5 179bd3656f72932f69b0f860d23483cd files/digest-gentoo-sources-2.4.28-r9 226
 MD5 0361b484cca5df06a9d3a66e1d18d733 files/digest-gentoo-sources-2.4.31-r1 144
-MD5 757ee1239c3f14645ccea3640d551e11 files/gentoo-sources-2.4.CAN-2004-1056.patch 11249
-MD5 3208f6b19f1e5734cfd6035945a52c5b files/digest-gentoo-sources-2.6.12-r4 222
-MD5 0f93b46ae17cbd0fc9b4d1cf5d704296 files/gentoo-sources-2.4.81106.patch 2243
-MD5 29e531cdd3f2effce5e31a1f2afb5b5d files/gentoo-sources-2.4.28.brk-locked.patch 8912
+MD5 d1ccc2047be533c992f67270a150a210 files/gentoo-sources-2.4.cmdlineLeak.patch 388
+MD5 b9a94233e1457787352e5f85e3e3582d files/gentoo-sources-2.4.binfmt_a.out.patch 2009
 MD5 fb66bd5497f574c00a8ba4d5f798dc00 files/Changelog-2.4.bz2 6590
-MD5 0c2bca31a62192779bf6129b3b23238b files/gentoo-sources-2.4.28.arpFix.patch 1021
-MD5 8344e7540cefaa51bfdf91ee7aae8068 files/digest-gentoo-sources-2.6.12-r6 224
-MD5 b1f723b1661a3fcbe79e921ddfe40584 files/gentoo-sources-2.4.PaX-84167.patch 1202
+MD5 1cd653d48c2ece7fbb55c16134288362 files/digest-gentoo-sources-2.6.9-r9 221
 MD5 b09e0ad41a8658a3e1309e5ab3ad652b files/gentoo-sources-2.4.28.77181.patch 295
-MD5 b6cd2468a246169a6e2f969c44e3f341 files/gentoo-sources-2.4.78362.patch 10372
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/gentoo-sources-2.4.CAN-2004-1016.patch 2835
+MD5 3208f6b19f1e5734cfd6035945a52c5b files/digest-gentoo-sources-2.6.12-r4 222
+MD5 8344e7540cefaa51bfdf91ee7aae8068 files/digest-gentoo-sources-2.6.12-r6 224
+MD5 6b5a9135fe2b600f298878b51762e65d files/digest-gentoo-sources-2.6.12-r7 224
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.6.10-r6 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.6.10-r6
deleted file mode 100644
index c404e5b9a62d..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.6.10-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
-MD5 d2320883af3bfe729cc2a14aa42551c6 genpatches-2.6-10.07-base.tar.bz2 70349
-MD5 21126e17ab222f82f6e51594ed05564d genpatches-2.6-10.07-extras.tar.bz2 156137
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.6.12-r7 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.6.12-r7
new file mode 100644
index 000000000000..0b28996414c7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.6.12-r7
@@ -0,0 +1,3 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 e691055686f00a6a8e7ca30e0a11a7f9 genpatches-2.6.12-11.base.tar.bz2 39237
+MD5 1e50ea34e63e0145b71d91b10cce2499 genpatches-2.6.12-11.extras.tar.bz2 229274
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.6.10-r6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.6.12-r7.ebuild
index 9d25a37c3288..b169d3020478 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.6.10-r6.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.6.12-r7.ebuild
@@ -1,29 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.10-r6.ebuild,v 1.4 2005/02/05 10:17:22 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.12-r7.ebuild,v 1.1 2005/07/30 19:53:25 dsd Exp $
 
 ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="11"
 IUSE="ultra1"
 inherit kernel-2
 detect_version
 detect_arch
 
-#version of gentoo patchset
-GPV="10.07"
-GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
-	mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-extras.tar.bz2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
-KEYWORDS="x86 ppc ~amd64 ~sparc"
-
-HOMEPAGE="http://dev.gentoo.org/~dsd/gentoo-dev-sources"
-
-UNIPATCH_LIST="${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
-	       ${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-extras.tar.bz2"
-UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/0000_README"
+HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches"
 
 DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GPV_SRC} ${ARCH_URI}"
-
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
 pkg_setup() {
 	if use sparc; then