Version bump to Software Suspend 2.1.9.9.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 174 insertions, 2 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index bc951b29207b..541bf4f8eb0e 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1 2005/07/06 11:04:03 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.2 2005/07/08 18:26:26 brix Exp $
+
+*suspend2-sources-2.6.12-r1 (08 Jul 2005)
+
+  08 Jul 2005; <brix@gentoo.org> +files/linux-2.6.12-try_to_freeze.patch,
+  +suspend2-sources-2.6.12-r1.ebuild:
+  Version bump to Software Suspend 2.1.9.9.
 
 *suspend2-sources-2.6.12 (06 Jul 2005)
 
diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest
index f07d70f5b5bb..44a91cbe11cc 100644
--- a/sys-kernel/suspend2-sources/Manifest
+++ b/sys-kernel/suspend2-sources/Manifest
@@ -1,6 +1,9 @@
+MD5 8bded6a42fa287daafcd56e7321d1a16 suspend2-sources-2.6.12-r1.ebuild 2108
 MD5 af3a2dc84edfa599714c447ccd2b58a2 suspend2-sources-2.6.12.ebuild 1965
-MD5 48296f6b51f8564eea9a5ebfb50ea9e1 ChangeLog 459
+MD5 997dc0f5653b486f02c6f862d265254a ChangeLog 659
 MD5 e40cb3df546efa5003fe3778c5a50854 metadata.xml 275
+MD5 320c41493bbe3f054a0a90d92c98e67f files/linux-2.6.12-try_to_freeze.patch 3190
+MD5 2c8a57cd0e140e095595b6ba9e57cead files/digest-suspend2-sources-2.6.12-r1 310
 MD5 2c13f91d861547f897bd8bc3e4d7e9cb files/digest-suspend2-sources-2.6.12 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/digest-suspend2-sources-2.6.12-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r1
new file mode 100644
index 000000000000..609b5b87b184
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.12-r1
@@ -0,0 +1,4 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 ddab7b1cb14955286ed3ac849bb79ae8 genpatches-2.6.12-7.base.tar.bz2 21193
+MD5 2d9aad1136dafa46665320ba4dec2d76 genpatches-2.6.12-7.extras.tar.bz2 227527
+MD5 f5b74120554c99d7e6ef592693ad7be6 software-suspend-2.1.9.9-for-2.6.12.tar.bz2 129521
diff --git a/sys-kernel/suspend2-sources/files/linux-2.6.12-try_to_freeze.patch b/sys-kernel/suspend2-sources/files/linux-2.6.12-try_to_freeze.patch
new file mode 100644
index 000000000000..09a33d63fc7b
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/linux-2.6.12-try_to_freeze.patch
@@ -0,0 +1,84 @@
+diff -urp linux-2.6.12/arch/arm/kernel/signal.c linux-2.6.12-try_to_freeze/arch/arm/kernel/signal.c
+--- linux-2.6.12/arch/arm/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12-try_to_freeze/arch/arm/kernel/signal.c	2005-07-08 19:48:20.000000000 +0200
+@@ -688,7 +688,7 @@ static int do_signal(sigset_t *oldset, s
+ 	if (!user_mode(regs))
+ 		return 0;
+ 
+-	if (try_to_freeze(0))
++	if (try_to_freeze())
+ 		goto no_signal;
+ 
+ 	if (current->ptrace & PT_SINGLESTEP)
+diff -urp linux-2.6.12/arch/mips/kernel/irixsig.c linux-2.6.12-try_to_freeze/arch/mips/kernel/irixsig.c
+--- linux-2.6.12/arch/mips/kernel/irixsig.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12-try_to_freeze/arch/mips/kernel/irixsig.c	2005-07-08 19:48:27.000000000 +0200
+@@ -178,7 +178,7 @@ asmlinkage int do_irix_signal(sigset_t *
+ 	if (!user_mode(regs))
+ 		return 1;
+ 
+-	if (try_to_freeze(0))
++	if (try_to_freeze())
+ 		goto no_signal;
+ 
+ 	if (!oldset)
+diff -urp linux-2.6.12/arch/mips/kernel/signal32.c linux-2.6.12-try_to_freeze/arch/mips/kernel/signal32.c
+--- linux-2.6.12/arch/mips/kernel/signal32.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12-try_to_freeze/arch/mips/kernel/signal32.c	2005-07-08 19:48:28.000000000 +0200
+@@ -774,7 +774,7 @@ int do_signal32(sigset_t *oldset, struct
+ 	if (!user_mode(regs))
+ 		return 1;
+ 
+-	if (try_to_freeze(0))
++	if (try_to_freeze())
+ 		goto no_signal;
+ 
+ 	if (!oldset)
+diff -urp linux-2.6.12/arch/mips/kernel/signal.c linux-2.6.12-try_to_freeze/arch/mips/kernel/signal.c
+--- linux-2.6.12/arch/mips/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12-try_to_freeze/arch/mips/kernel/signal.c	2005-07-08 19:48:27.000000000 +0200
+@@ -457,7 +457,7 @@ static int do_signal(sigset_t *oldset, s
+ 	if (!user_mode(regs))
+ 		return 1;
+ 
+-	if (try_to_freeze(0))
++	if (try_to_freeze())
+ 		goto no_signal;
+ 
+ 	if (!oldset)
+diff -urp linux-2.6.12/arch/sh/kernel/signal.c linux-2.6.12-try_to_freeze/arch/sh/kernel/signal.c
+--- linux-2.6.12/arch/sh/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12-try_to_freeze/arch/sh/kernel/signal.c	2005-07-08 19:48:19.000000000 +0200
+@@ -579,7 +579,7 @@ int do_signal(struct pt_regs *regs, sigs
+ 	if (!user_mode(regs))
+ 		return 1;
+ 
+-	if (try_to_freeze(0))
++	if (try_to_freeze())
+ 		goto no_signal;
+ 
+ 	if (!oldset)
+diff -urp linux-2.6.12/arch/sh64/kernel/signal.c linux-2.6.12-try_to_freeze/arch/sh64/kernel/signal.c
+--- linux-2.6.12/arch/sh64/kernel/signal.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12-try_to_freeze/arch/sh64/kernel/signal.c	2005-07-08 19:48:29.000000000 +0200
+@@ -697,7 +697,7 @@ int do_signal(struct pt_regs *regs, sigs
+ 	if (!user_mode(regs))
+ 		return 1;
+ 
+-	if (try_to_freeze(0))
++	if (try_to_freeze())
+ 		goto no_signal;
+ 
+ 	if (!oldset)
+diff -urp linux-2.6.12/fs/jffs2/background.c linux-2.6.12-try_to_freeze/fs/jffs2/background.c
+--- linux-2.6.12/fs/jffs2/background.c	2005-06-17 21:48:29.000000000 +0200
++++ linux-2.6.12-try_to_freeze/fs/jffs2/background.c	2005-07-08 19:48:11.000000000 +0200
+@@ -92,7 +92,7 @@ static int jffs2_garbage_collect_thread(
+ 			schedule();
+ 		}
+ 
+-		if (try_to_freeze(0))
++		if (try_to_freeze())
+ 			continue;
+ 
+ 		cond_resched();
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r1.ebuild
new file mode 100644
index 000000000000..87c5013ee4b8
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.12-r1.ebuild
@@ -0,0 +1,75 @@
+# 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.12-r1.ebuild,v 1.1 2005/07/08 18:26:26 brix Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="7"
+
+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.1.9.9"
+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="${FILESDIR}/4306_dm-bbr-create_workqueue.patch
+${FILESDIR}/linux-2.6.12-vesafb-tng-suspend2.patch
+${FILESDIR}/linux-2.6.12-try_to_freeze.patch"
+UNIPATCH_STRICTORDER="yes"
+UNIPATCH_DOCS="${WORKDIR}/${SUSPEND2_SRC}/Changelog
+${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.5.0
+		>=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
+
+	cd ${S}
+	EPATCH_EXCLUDE="apply Changelog 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
+}