Version bump.

(Portage version: 2.0.51.22-r2)

5 files changed, 106 insertions, 2 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index 33f7e1a6746e..4178bb9e19e5 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.9 2005/08/29 11:07:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.10 2005/08/29 20:10:38 brix Exp $
+
+*suspend2-sources-2.6.13 (29 Aug 2005)
+
+  29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch,
+  +suspend2-sources-2.6.13.ebuild:
+  Version bump.
 
   29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
   suspend2-sources-2.6.12-r6.ebuild:
diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest
index f6358818250f..d275b44192f6 100644
--- a/sys-kernel/suspend2-sources/Manifest
+++ b/sys-kernel/suspend2-sources/Manifest
@@ -1,8 +1,11 @@
+MD5 25261baaf505a86f51234dbc7a62b60a suspend2-sources-2.6.13.ebuild 1952
 MD5 6a6afac09e206eb57664c020b521b29b suspend2-sources-2.6.12-r6.ebuild 2157
-MD5 806afecdfd57acfe2c4c68cffcc7af5e ChangeLog 1965
+MD5 29ce9637d01d6bcb6ca1128f0b9b2499 ChangeLog 2172
 MD5 e40cb3df546efa5003fe3778c5a50854 metadata.xml 275
+MD5 8c885e50de95004ba759a137c3f93495 files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch 877
 MD5 320c41493bbe3f054a0a90d92c98e67f files/linux-2.6.12-try_to_freeze.patch 3190
 MD5 787fbef2c88ac718b5cca330dc6451ef files/linux-2.6.12-skge-pm_message_t.patch 814
 MD5 a52b2429f74b0629c13f2f028cbd4682 files/digest-suspend2-sources-2.6.12-r6 312
+MD5 a67db8b8f894652b4d1456406d307a37 files/digest-suspend2-sources-2.6.13 310
 MD5 2b6c45a5cc42e34edf11954e71a95815 files/4306_dm-bbr-create_workqueue.patch 548
 MD5 0b4371d982e38217edb8af1023bb4803 files/linux-2.6.12-vesafb-tng-suspend2.patch 633
diff --git a/sys-kernel/suspend2-sources/files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch b/sys-kernel/suspend2-sources/files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch
new file mode 100644
index 000000000000..9fcc613dca3a
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch
@@ -0,0 +1,14 @@
+diff -urp software-suspend-2.2-rc3-for-2.6.13/include/asm-i386/suspend2.h software-suspend-2.2-rc3-for-2.6.13-gcc4/include/asm-i386/suspend2.h
+--- software-suspend-2.2-rc3-for-2.6.13/include/asm-i386/suspend2.h	2005-08-29 17:16:06.000000000 +0200
++++ software-suspend-2.2-rc3-for-2.6.13-gcc4/include/asm-i386/suspend2.h	2005-08-29 17:16:33.000000000 +0200
+@@ -233,8 +233,8 @@ static inline void restore_processor_con
+ 
+ 	/* tell gcc that we clobbered all the registers... 
+ 	 * otherwise it might keep some addresses there. */
+-	//asm volatile ("" : : : "esp", "eax", "ebx", "ecx", "edx", "esi", "edi");
+-	asm volatile ("" : : : "esp", "ebp", "eax", "ebx", "ecx", "edx", "esi", "edi");
++	asm volatile ("" : : : "esp", "eax", "ebx", "ecx", "edx", "esi", "edi");
++	//asm volatile ("" : : : "esp", "ebp", "eax", "ebx", "ecx", "edx", "esi", "edi");
+ 	
+ 	fix_processor_context();
+ 
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.13 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.13
new file mode 100644
index 000000000000..1468f3043e22
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.13
@@ -0,0 +1,4 @@
+MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
+MD5 ac43582ec7a1280eee78eabb9c416662 genpatches-2.6.13-1.base.tar.bz2 16013
+MD5 21163359c3e79381e428198707f63167 genpatches-2.6.13-1.extras.tar.bz2 159820
+MD5 c334d67f616084722f08a1893fdd9e5f software-suspend-2.2-rc3-for-2.6.13.tar.bz2 117175
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.13.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.13.ebuild
new file mode 100644
index 000000000000..73f479da8e19
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 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.13.ebuild,v 1.1 2005/08/29 20:10:38 brix 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-rc3"
+SUSPEND2_TARGET="${PV}"
+SUSPEND2_SRC="software-suspend-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
+SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2"
+
+UNIPATCH_LIST=""
+UNIPATCH_STRICTORDER="yes"
+UNIPATCH_DOCS="${WORKDIR}/${SUSPEND2_SRC}/Changelog.txt
+${WORKDIR}/${SUSPEND2_SRC}/ToDo"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
+
+KEYWORDS="~x86"
+
+IUSE="ultra1"
+RDEPEND="${RDEPEND}
+		>=sys-apps/suspend2-userui-0.6.1
+		>=sys-power/hibernate-script-1.09"
+
+K_EXTRAEINFO="If there are issues with this kernel, please direct any
+queries to the suspend2-devel mailing list:
+http://lists.suspend2.net/cgi-bin/mailman/listinfo/suspend2-devel"
+
+pkg_setup() {
+	if use sparc; then
+		# hme lockup hack on ultra1
+		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
+	fi
+}
+
+src_unpack() {
+	kernel-2_src_unpack
+
+	cd ${WORKDIR}
+	unpack ${SUSPEND2_SRC}.tar.bz2
+
+	cp ${FILESDIR}/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch \
+		${WORKDIR}/${SUSPEND2_SRC}
+
+	cd ${S}
+	EPATCH_EXCLUDE="apply Changelog.txt unapply ToDo" \
+	EPATCH_FORCE="yes" \
+	EPATCH_SUFFIX="" \
+	EPATCH_OPTS="-p1" \
+	epatch ${WORKDIR}/${SUSPEND2_SRC}
+}
+
+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
+}