Added 2.6.20

(Portage version: 2.1.2-r9)

10 files changed, 55 insertions, 98 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index a5a986052944..5fd400988677 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/suspend2-sources
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.81 2007/02/07 07:07:29 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.82 2007/02/09 21:37:57 alonbl Exp $
+
+*suspend2-sources-2.6.20 (09 Feb 2007)
+
+  09 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/suspend2-2.2.9.7-kunmapping.patch,
+  suspend2-sources-2.6.18-r1.ebuild, suspend2-sources-2.6.18-r3.ebuild,
+  -suspend2-sources-2.6.19.ebuild, -suspend2-sources-2.6.19-r1.ebuild,
+  suspend2-sources-2.6.19-r2.ebuild, +suspend2-sources-2.6.20.ebuild:
+  Added 2.6.20
 
 *suspend2-sources-2.6.19-r2 (07 Feb 2007)
 
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19
deleted file mode 100644
index 4a022e33f7cb..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 2220a52a49c78d249aed2357bad7ac61 genpatches-2.6.19-1.base.tar.bz2 2094
-RMD160 85c472878cdbb4f1224e3c92838c117efe72982c genpatches-2.6.19-1.base.tar.bz2 2094
-SHA256 72449c4be0bdd71986200e2729782b42aec7cf41149f0d9e7f08d2caec053521 genpatches-2.6.19-1.base.tar.bz2 2094
-MD5 74efb178b3a736df509d9d497ffe2ba3 genpatches-2.6.19-1.extras.tar.bz2 139875
-RMD160 4e418ab59a29ec38852a45ee1c8e2974c0b9de6d genpatches-2.6.19-1.extras.tar.bz2 139875
-SHA256 562b5009efbcc2d17fd5f8fbd0ef5eaeccd542a775960050ce6ca751720331cf genpatches-2.6.19-1.extras.tar.bz2 139875
-MD5 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 42733268
-RMD160 75dc65b15cf9cdb359b1abe7084907982c19088b linux-2.6.19.tar.bz2 42733268
-SHA256 c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58 linux-2.6.19.tar.bz2 42733268
-MD5 ce94df22b93c74f1637d2429c1093ec7 suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
-RMD160 7c27f1d1514a30a410b779c61c8ffad7fe231369 suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
-SHA256 3321c0004016fcb4b1e490fd42f98f6855c475baa8bcb21917481dadc1af638a suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r1
deleted file mode 100644
index 68a040464e36..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 8b778c527e7eb4cffc7cac6106163e63 genpatches-2.6.19-3.base.tar.bz2 15941
-RMD160 44db8c27990e978fe9116a49388eda610a473977 genpatches-2.6.19-3.base.tar.bz2 15941
-SHA256 6af4f94b8cea0c86bda44ae9666a23f6e6666f1fc353f7fd0801c6cb5837b762 genpatches-2.6.19-3.base.tar.bz2 15941
-MD5 a6180931d7b566aa514d532dff0c07f1 genpatches-2.6.19-3.extras.tar.bz2 139459
-RMD160 9b3dd25b781854feab0d325cc4327e7035fef60b genpatches-2.6.19-3.extras.tar.bz2 139459
-SHA256 9900288ef68f9c9f93fab4659a4eb2c50d3a3b0ee64e457d9aafee642cd7be19 genpatches-2.6.19-3.extras.tar.bz2 139459
-MD5 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 42733268
-RMD160 75dc65b15cf9cdb359b1abe7084907982c19088b linux-2.6.19.tar.bz2 42733268
-SHA256 c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58 linux-2.6.19.tar.bz2 42733268
-MD5 ce94df22b93c74f1637d2429c1093ec7 suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
-RMD160 7c27f1d1514a30a410b779c61c8ffad7fe231369 suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
-SHA256 3321c0004016fcb4b1e490fd42f98f6855c475baa8bcb21917481dadc1af638a suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20
new file mode 100644
index 000000000000..4dd7792c1192
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20
@@ -0,0 +1,12 @@
+MD5 e03b3c5be8d0705e515e68249e4d8d10 genpatches-2.6.20-1.base.tar.bz2 1152
+RMD160 6b9711102f469e4f0db23fb7f3b3aec6a19ce4c3 genpatches-2.6.20-1.base.tar.bz2 1152
+SHA256 410c6bf55696c13833ed2d7b7745b6eb127d73ae8a9573e66df7169de3261ae5 genpatches-2.6.20-1.base.tar.bz2 1152
+MD5 48dd89be44a6f34f6e5b612e4470ce26 genpatches-2.6.20-1.extras.tar.bz2 141473
+RMD160 d4a7c593f44011a3104b06314510a6e36b1866f6 genpatches-2.6.20-1.extras.tar.bz2 141473
+SHA256 4dc6dbaa64b34b3cfc1114e2ff602a66677d9f693b0da59ac849a9c1f0abf275 genpatches-2.6.20-1.extras.tar.bz2 141473
+MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
+RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
+SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
+MD5 46a2d91f1de4c17c46b8f9d017601816 suspend2-2.2.9.7-for-2.6.20.patch.bz2 103822
+RMD160 12c52a39dc11fce72875f1c4662369cc99590735 suspend2-2.2.9.7-for-2.6.20.patch.bz2 103822
+SHA256 58884db7f3560b89ffd9c81ff2416e822bd8acc54553f08f4cfc1bb698e7b2d9 suspend2-2.2.9.7-for-2.6.20.patch.bz2 103822
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2.9.7-kunmapping.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2.9.7-kunmapping.patch
new file mode 100644
index 000000000000..93842415ac2d
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2.9.7-kunmapping.patch
@@ -0,0 +1,16 @@
+ pagedir.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff -ruNp 910.patch-old/kernel/power/pagedir.c 910.patch-new/kernel/power/pagedir.c
+--- 910.patch-old/kernel/power/pagedir.c	2007-02-09 09:48:33.000000000 +1100
++++ 910.patch-new/kernel/power/pagedir.c	2007-02-09 09:48:17.000000000 +1100
+@@ -449,7 +449,7 @@ int suspend_get_pageset1_load_addresses(
+ 				*last_high_pbe_ptr = this_high_pbe;
+ 			last_high_pbe_ptr = &this_high_pbe->next;
+ 			if (unmap_last_high) {
+-				kunmap(virt_to_page(*last_high_pbe_ptr));
++				kunmap(high_pbe_page);
+ 				unmap_last_high = 0;
+ 			}
+ 			this_high_pbe = get_next_pbe(&high_pbe_page, this_high_pbe, 1);
+
+
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r1.ebuild
index f78cbbbc334e..37743d1de960 100644
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r1.ebuild
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r1.ebuild,v 1.3 2006/12/19 00:07:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r1.ebuild,v 1.4 2007/02/09 21:37:57 alonbl Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -27,7 +27,7 @@ KEYWORDS="~amd64 x86"
 
 IUSE="ultra1"
 RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.6.1
+		~sys-apps/suspend2-userui-0.6.4
 		>=sys-power/hibernate-script-1.12"
 
 K_EXTRAEINFO="If there are issues with this kernel, please direct any
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r3.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r3.ebuild
index 2fe9683f2ddc..7c5e96ed1bcb 100644
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r3.ebuild
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r3.ebuild,v 1.1 2006/12/27 16:52:19 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.18-r3.ebuild,v 1.2 2007/02/09 21:37:57 alonbl Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -27,7 +27,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="ultra1"
 RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.6.1
+		~sys-apps/suspend2-userui-0.6.4
 		>=sys-power/hibernate-script-1.12"
 
 K_EXTRAEINFO="If there are issues with this kernel, please direct any
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r2.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r2.ebuild
index 15fc53e41482..48ad64a303cd 100644
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r2.ebuild
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r2.ebuild,v 1.1 2007/02/07 07:07:29 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r2.ebuild,v 1.2 2007/02/09 21:37:57 alonbl Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -28,7 +28,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="ultra1"
 RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.6.1
+		~sys-apps/suspend2-userui-0.6.4
 		>=sys-power/hibernate-script-1.93-r6"
 
 K_EXTRAEINFO="If there are issues with this kernel, please direct any
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.19.ebuild
deleted file mode 100644
index 5c36a1503f16..000000000000
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.19.ebuild,v 1.1 2006/12/09 09:57:43 phreak Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-
-inherit eutils kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="Software Suspend 2 + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net"
-
-SUSPEND2_VERSION="2.2.9"
-SUSPEND2_TARGET="2.6.19-rc6"
-SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
-SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.patch.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.patch.bz2"
-UNIPATCH_STRICTORDER="yes"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ultra1"
-RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.6.1
-		>=sys-power/hibernate-script-1.12"
-
-K_EXTRAEINFO="If there are issues with this kernel, please direct any
-queries to the suspend2-users mailing list:
-http://lists.suspend2.net/mailman/listinfo/suspend2-users/"
-
-pkg_setup() {
-	if use sparc; then
-		# hme lockup hack on ultra1
-		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1705_sparc-U1-hme-lockup.patch"
-	fi
-}
-
-pkg_postinst() {
-	postinst_sources
-
-	echo
-
-	if [ "${ARCH}" = "sparc" ]; then
-		if [ x"`cat /proc/openprom/name 2>/dev/null`" \
-			 = x"'SUNW,Ultra-1'" ]; then
-			einfo "For users with an Enterprise model Ultra 1 using the HME"
-			einfo "network interface, please emerge the kernel using the"
-			einfo "following command: USE=ultra1 emerge ${PN}"
-		fi
-	fi
-}
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20.ebuild
index 90b9fbe665af..d8f8273270bb 100644
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r1.ebuild
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r1.ebuild,v 1.1 2006/12/17 20:00:28 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.20.ebuild,v 1.1 2007/02/09 21:37:57 alonbl Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="3"
+K_GENPATCHES_VER="1"
 
 inherit eutils kernel-2
 detect_version
@@ -13,13 +13,14 @@ detect_arch
 DESCRIPTION="Software Suspend 2 + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net"
 
-SUSPEND2_VERSION="2.2.9"
-SUSPEND2_TARGET="2.6.19-rc6"
+SUSPEND2_VERSION="2.2.9.7"
+SUSPEND2_TARGET="2.6.20"
 SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
 SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.patch.bz2"
 
 UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.patch.bz2
-	${FILESDIR}/${P}-vesafb.patch"
+	${FILESDIR}/suspend2-${SUSPEND2_VERSION}-kunmapping.patch
+	${FILESDIR}/${PN}-2.6.19-vesafb.patch"
 UNIPATCH_STRICTORDER="yes"
 
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
@@ -28,8 +29,8 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="ultra1"
 RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.6.1
-		>=sys-power/hibernate-script-1.93-r6"
+		~sys-apps/suspend2-userui-0.7.0
+		>=sys-power/hibernate-script-1.94"
 
 K_EXTRAEINFO="If there are issues with this kernel, please direct any
 queries to the suspend2-users mailing list: