7 files changed, 13 insertions, 108 deletions
diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index fadc2bf59d73..a510c4e9c756 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.92 2007/05/15 12:28:59 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.93 2007/05/17 17:20:43 alonbl Exp $
+
+*suspend2-sources-2.6.21-r3 (17 May 2007)
+
+  17 May 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -suspend2-sources-2.6.21.ebuild, -suspend2-sources-2.6.21-r1.ebuild,
+  -suspend2-sources-2.6.21-r2.ebuild, +suspend2-sources-2.6.21-r3.ebuild:
+  Version bump
 
 *suspend2-sources-2.6.21-r2 (15 May 2007)
 
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21
deleted file mode 100644
index ea379e93edbf..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21
+++ /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 6becc4ecbfcd5d2c9f25fa85bd46c175 suspend2-2.2.9.13-for-2.6.21-rc7.patch.bz2 108337
-RMD160 c4b943ca2a1323753a6f481af28d0e9f69599f82 suspend2-2.2.9.13-for-2.6.21-rc7.patch.bz2 108337
-SHA256 5d32d76f8e4d41aafa68939fdac83586a69926daf49501dc4b95c6fbac12e1da suspend2-2.2.9.13-for-2.6.21-rc7.patch.bz2 108337
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r2 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r2
deleted file mode 100644
index 193d3456eb4f..000000000000
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r2
+++ /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 b5d8e782c90f8263b6bab2739b7c65c9 suspend2-2.2.9.16-for-2.6.21.patch.bz2 95649
-RMD160 fcb288e2f11abb4428f27298703b81c120ef98c2 suspend2-2.2.9.16-for-2.6.21.patch.bz2 95649
-SHA256 11fb0df3b6ff24cd7e57773c1727228a3380f4ed42cc73e036a562f659e22550 suspend2-2.2.9.16-for-2.6.21.patch.bz2 95649
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r3
index bfc20319aae7..fb53337dc425 100644
--- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r1
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.21-r3
@@ -7,6 +7,6 @@ SHA256 041c44707e409535b385e248b7e654b3e0927116dc7282f0c461b1627f50214d genpatch
 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 6b487092ae4396db71d63cc9945be861 suspend2-2.2.9.15-for-2.6.21.patch.bz2 95253
-RMD160 2d3f5d4450d726c677da30e293bdc468786a122b suspend2-2.2.9.15-for-2.6.21.patch.bz2 95253
-SHA256 347c2765a8e452ae23837b2deab8a69adeeac1402b029af1045843f8fec10fb2 suspend2-2.2.9.15-for-2.6.21.patch.bz2 95253
+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/suspend2-sources-2.6.21-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r1.ebuild
deleted file mode 100644
index 5198a2f6f0f7..000000000000
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r1.ebuild
+++ /dev/null
@@ -1,39 +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.21-r1.ebuild,v 1.2 2007/05/11 22:57:50 alonbl Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-
-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.15"
-SUSPEND2_TARGET="2.6.21"
-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.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.21-r2.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r3.ebuild
index 5c587394d044..43b920cf7f4a 100644
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r2.ebuild
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-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.21-r2.ebuild,v 1.1 2007/05/15 12:28:59 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.21-r3.ebuild,v 1.1 2007/05/17 17:20:43 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.16"
+SUSPEND2_VERSION="2.2.9.17"
 SUSPEND2_TARGET="2.6.21"
 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.21.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.21.ebuild
deleted file mode 100644
index 6eee72040b29..000000000000
--- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.21.ebuild
+++ /dev/null
@@ -1,39 +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.21.ebuild,v 1.1 2007/04/28 18:58:33 alonbl Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-
-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.13"
-SUSPEND2_TARGET="2.6.21-rc7"
-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.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}"
-}