Version bump

(Portage version: 2.1.2.2)

8 files changed, 14 insertions, 145 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index a61490457990..1d9759956223 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.85 2007/03/15 20:15:46 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.86 2007/03/23 14:10:15 alonbl Exp $
+
+*suspend2-sources-2.6.20-r3 (23 Mar 2007)
+
+  23 Mar 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/suspend2-2.2.9.7-kunmapping.patch, -suspend2-sources-2.6.20.ebuild,
+  -suspend2-sources-2.6.20-r1.ebuild, -suspend2-sources-2.6.20-r2.ebuild,
+  +suspend2-sources-2.6.20-r3.ebuild:
+  Version bump
 
 *suspend2-sources-2.6.20-r2 (15 Mar 2007)
 
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
deleted file mode 100644
index 4dd7792c1192..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20
+++ /dev/null
@@ -1,12 +0,0 @@
-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/digest-suspend2-sources-2.6.20-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r1
deleted file mode 100644
index 54f02f74b0e6..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 2cbe90390184f917db935886aacbdc96 genpatches-2.6.20-3.base.tar.bz2 40036
-RMD160 3cf78d8b7827e54d0a09281e71b643d61b83ff99 genpatches-2.6.20-3.base.tar.bz2 40036
-SHA256 05cc64d1a39d9f483be710b276c87a19b01287c4028c4a2ebcfffa915a3d81f6 genpatches-2.6.20-3.base.tar.bz2 40036
-MD5 d151502989cf8060387125795e50f433 genpatches-2.6.20-3.extras.tar.bz2 143454
-RMD160 cc2385995956eca95b968394f71c128bc2944881 genpatches-2.6.20-3.extras.tar.bz2 143454
-SHA256 85045253ca5b72d20e95816c2ce29d4a6f1a3255b18ca4ea38c7bb5c20aec629 genpatches-2.6.20-3.extras.tar.bz2 143454
-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 39bd60180fe30ad78659f86a0fae78f2 suspend2-2.2.9.9-for-2.6.20.patch.bz2 105775
-RMD160 cb6b31ca73464da23b634866971ccbca89249c6b suspend2-2.2.9.9-for-2.6.20.patch.bz2 105775
-SHA256 cdbcc3710fe3ffb3e58ec1a782d89f05329630e45579947a48d7116bba64f926 suspend2-2.2.9.9-for-2.6.20.patch.bz2 105775
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r2 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r3
index 0e4a0b19d4df..eb16f2374eb8 100644
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r2
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r3
@@ -7,6 +7,6 @@ SHA256 85045253ca5b72d20e95816c2ce29d4a6f1a3255b18ca4ea38c7bb5c20aec629 genpatch
 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 39bd60180fe30ad78659f86a0fae78f2 suspend2-2.2.9.9-for-2.6.20.patch.bz2 105775
-RMD160 cb6b31ca73464da23b634866971ccbca89249c6b suspend2-2.2.9.9-for-2.6.20.patch.bz2 105775
-SHA256 cdbcc3710fe3ffb3e58ec1a782d89f05329630e45579947a48d7116bba64f926 suspend2-2.2.9.9-for-2.6.20.patch.bz2 105775
+MD5 f1c60693ed7d52b9eef3f0d12974865d suspend2-2.2.9.10-for-2.6.20.patch.bz2 106130
+RMD160 fb0e4211ab475c16cabb664476c7e93f678b462f suspend2-2.2.9.10-for-2.6.20.patch.bz2 106130
+SHA256 7ea9569ac4a578275199a3e1b56da3096a2bcdbb584642e5325a56919f2bdb31 suspend2-2.2.9.10-for-2.6.20.patch.bz2 106130
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
deleted file mode 100644
index 93842415ac2d..000000000000
--- a/sys-kernel/suspend2-sources/files/suspend2-2.2.9.7-kunmapping.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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.20-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r1.ebuild
deleted file mode 100644
index a7aa73633063..000000000000
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.20-r1.ebuild,v 1.1 2007/03/12 19:07:11 alonbl Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="3"
-
-inherit 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.9"
-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}/${PN}-2.6.19-vesafb.patch"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${RDEPEND}
-		~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:
-http://lists.suspend2.net/mailman/listinfo/suspend2-users/"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r2.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r3.ebuild
index 175082a12fd4..e0489600009c 100644
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r2.ebuild
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r3.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.20-r2.ebuild,v 1.1 2007/03/15 20:15:46 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r3.ebuild,v 1.1 2007/03/23 14:10:15 alonbl Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -13,7 +13,7 @@ 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.9"
+SUSPEND2_VERSION="2.2.9.10"
 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"
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.20.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20.ebuild
deleted file mode 100644
index d8f8273270bb..000000000000
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.20.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.20.ebuild,v 1.1 2007/02/09 21:37:57 alonbl 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.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}/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}"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ultra1"
-RDEPEND="${RDEPEND}
-		~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:
-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
-}