Version bump

(Portage version: 2.1.2.7)

6 files changed, 78 insertions, 19 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index 14e0d3f07e56..793a52e9c3af 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.94 2007/05/17 19:42:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.95 2007/05/19 08:58:20 alonbl Exp $
+
+*suspend2-sources-2.6.21-r4 (19 May 2007)
+*suspend2-sources-2.6.20-r6 (19 May 2007)
+
+  19 May 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +suspend2-sources-2.6.20-r6.ebuild, -suspend2-sources-2.6.21-r3.ebuild,
+  +suspend2-sources-2.6.21-r4.ebuild:
+  Version bump
 
   17 May 2007; Alon Bar-Lev <alonbl@gentoo.org>
   suspend2-sources-2.6.21-r3.ebuild:
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r6 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r6
new file mode 100644
index 000000000000..85aec10669d0
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.20-r6
@@ -0,0 +1,12 @@
+MD5 ba568d660e74711524855375d2f2829d genpatches-2.6.20-10.base.tar.bz2 100639
+RMD160 bacc82bfb17e129375cdf7d16483e5b398ebd2f5 genpatches-2.6.20-10.base.tar.bz2 100639
+SHA256 90096ad554ef18d360e878d1bbc3c18b82c0b4b48002abb1f595dfdd973d4e35 genpatches-2.6.20-10.base.tar.bz2 100639
+MD5 032ecdb778783de98782c26c1fe362bf genpatches-2.6.20-10.extras.tar.bz2 143348
+RMD160 2863b37b53d11820fbfb2cebb279ca71f7ec9541 genpatches-2.6.20-10.extras.tar.bz2 143348
+SHA256 71a3d01c6168af2ef50d67fd201cf777ac866b185576d99de763a1b74b2a4e60 genpatches-2.6.20-10.extras.tar.bz2 143348
+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 111d694de1f7b06f6cc242b3a80b7df9 suspend2-2.2.10-for-2.6.20.11.patch.bz2 95824
+RMD160 62fc13a048b2e2dd2ca499f17ee1fcb42bb582e1 suspend2-2.2.10-for-2.6.20.11.patch.bz2 95824
+SHA256 0dbf79cfe362ea9eda823604a7220da02c2910c7189bd53c5179b5dbf6c0a139 suspend2-2.2.10-for-2.6.20.11.patch.bz2 95824
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r3 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r3
deleted file mode 100644
index fb53337dc425..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 5831fd3adc21152fbd8dcebe12f2e52f genpatches-2.6.21-1.base.tar.bz2 1050
-RMD160 da561dd019aea7c4b4b33e1afce1004ba93f504f genpatches-2.6.21-1.base.tar.bz2 1050
-SHA256 4d9d263d4c3916a68526a7b6ec4208afce071aaf541aa884f5bd78e0654e063a genpatches-2.6.21-1.base.tar.bz2 1050
-MD5 db6b73803ea3ef1d68282ba2a0e324bb genpatches-2.6.21-1.extras.tar.bz2 138898
-RMD160 2307e415b37d4b20fb6d64f76708a8787c6efe54 genpatches-2.6.21-1.extras.tar.bz2 138898
-SHA256 041c44707e409535b385e248b7e654b3e0927116dc7282f0c461b1627f50214d genpatches-2.6.21-1.extras.tar.bz2 138898
-MD5 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 43997476
-RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 linux-2.6.21.tar.bz2 43997476
-SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 linux-2.6.21.tar.bz2 43997476
-MD5 0f369c4751cb23b7dd347aa54557bd5e suspend2-2.2.9.17-for-2.6.21.patch.bz2 95874
-RMD160 abfa53c54b41966848ab75b642401327de66ce7b suspend2-2.2.9.17-for-2.6.21.patch.bz2 95874
-SHA256 c87321686fa3fbc698c16e109a7ddb0221c33253af0b86b4383103c3ef476321 suspend2-2.2.9.17-for-2.6.21.patch.bz2 95874
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r4 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r4
new file mode 100644
index 000000000000..b146bd0f716b
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r4
@@ -0,0 +1,12 @@
+MD5 c439b9f6ba1b0200442e10c5cab7ebc1 genpatches-2.6.21-2.base.tar.bz2 6792
+RMD160 c72ff75bd748fc87c4cefb8092934c6c10f28c4e genpatches-2.6.21-2.base.tar.bz2 6792
+SHA256 b486390c5fd0f55605e92fc476fe6be57125a2b384860fa00d62aa43146f04ca genpatches-2.6.21-2.base.tar.bz2 6792
+MD5 09a522bd61ac44c1839518fc22a05308 genpatches-2.6.21-2.extras.tar.bz2 141178
+RMD160 e4909bfb785c28aebf0790674cedf9794b31fdf3 genpatches-2.6.21-2.extras.tar.bz2 141178
+SHA256 3649ed51afd51ca51fa629093b2e969284fa2ce5ddb0afffc0ebee7a94436a16 genpatches-2.6.21-2.extras.tar.bz2 141178
+MD5 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 43997476
+RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 linux-2.6.21.tar.bz2 43997476
+SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 linux-2.6.21.tar.bz2 43997476
+MD5 f3e50976d7ada68d75e4b3c4d3914a72 suspend2-2.2.10-for-2.6.21.1.patch.bz2 95850
+RMD160 67049f509beb4807f823d7572c29db1f1cf955c1 suspend2-2.2.10-for-2.6.21.1.patch.bz2 95850
+SHA256 12c68eb3de203b5428e0c10b670650394b15f57bc39c9ce29bcbdb176e4190f1 suspend2-2.2.10-for-2.6.21.1.patch.bz2 95850
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r3.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r6.ebuild
index 7d2da17df960..b7f99eba08d2 100644
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r3.ebuild
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r6.ebuild
@@ -1,10 +1,10 @@
 # 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.21-r3.ebuild,v 1.2 2007/05/17 19:42:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.20-r6.ebuild,v 1.1 2007/05/19 08:58:20 alonbl Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="10"
 
 inherit kernel-2
 detect_version
@@ -13,8 +13,8 @@ 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.17"
-SUSPEND2_TARGET="2.6.21"
+SUSPEND2_VERSION="2.2.10"
+SUSPEND2_TARGET="2.6.20.11"
 SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
 SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.patch.bz2"
 
@@ -25,8 +25,8 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${RDEPEND}
-		>=sys-apps/suspend2-userui-0.7.1_pre
-		>=sys-power/hibernate-script-1.94"
+		>=sys-apps/suspend2-userui-0.7.1
+		>=sys-power/hibernate-script-1.95"
 
 K_EXTRAEINFO="If there are issues with this kernel, please direct any
 queries to the suspend2-users mailing list:
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r4.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r4.ebuild
new file mode 100644
index 000000000000..f6c70e063dc5
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r4.ebuild
@@ -0,0 +1,39 @@
+# 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.21-r4.ebuild,v 1.1 2007/05/19 08:58:20 alonbl Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="2"
+
+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.10"
+SUSPEND2_TARGET="2.6.21.1"
+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"
+
+RDEPEND="${RDEPEND}
+		>=sys-apps/suspend2-userui-0.7.1
+		>=sys-power/hibernate-script-1.95"
+
+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}"
+}