Revision bump to use Software Suspend 2.2-rc4 + fix for PowerdownMethod 5.

(Portage version: 2.0.51.22-r2)

5 files changed, 104 insertions, 2 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index 4178bb9e19e5..ce9d1578d505 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.10 2005/08/29 20:10:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.11 2005/08/30 10:41:58 brix Exp $
+
+*suspend2-sources-2.6.13-r1 (30 Aug 2005)
+
+  30 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/linux-2.6.13-poweroff.patch, +suspend2-sources-2.6.13-r1.ebuild:
+  Revision bump to use Software Suspend 2.2-rc4 + fix for PowerdownMethod 5.
 
 *suspend2-sources-2.6.13 (29 Aug 2005)
 
diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest
index 2c53835e7a02..d8466571793a 100644
--- a/sys-kernel/suspend2-sources/Manifest
+++ b/sys-kernel/suspend2-sources/Manifest
@@ -1,11 +1,14 @@
+MD5 74eb38a0667d0ab89a3c4f02acc8b369 suspend2-sources-2.6.13-r1.ebuild 1892
 MD5 6390d140bb44f262eb10401c6de55326 suspend2-sources-2.6.13.ebuild 2070
 MD5 6a6afac09e206eb57664c020b521b29b suspend2-sources-2.6.12-r6.ebuild 2157
-MD5 4225301b7aaf9d95fe27a1e96d1e3d81 ChangeLog 2173
+MD5 0caee8267b725924d34c1bef826ad9d5 ChangeLog 2422
 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 5ff92c313009119044ed51956fb509f9 files/digest-suspend2-sources-2.6.13-r1 310
+MD5 d1eff82a3bab3c5b67dec45a552888e4 files/linux-2.6.13-poweroff.patch 500
 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/digest-suspend2-sources-2.6.13-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.13-r1
new file mode 100644
index 000000000000..14f26195d693
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.13-r1
@@ -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 a0eaf6e4f4bf80f1f3077da3f4955236 software-suspend-2.2-rc4-for-2.6.13.tar.bz2 117003
diff --git a/sys-kernel/suspend2-sources/files/linux-2.6.13-poweroff.patch b/sys-kernel/suspend2-sources/files/linux-2.6.13-poweroff.patch
new file mode 100644
index 000000000000..314c5f07e3e3
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/linux-2.6.13-poweroff.patch
@@ -0,0 +1,16 @@
+diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
+--- a/drivers/acpi/sleep/poweroff.c
++++ b/drivers/acpi/sleep/poweroff.c
+@@ -55,11 +55,7 @@ void acpi_power_off(void)
+ 
+ static int acpi_shutdown(struct sys_device *x)
+ {
+-	if (system_state == SYSTEM_POWER_OFF) {
+-		/* Prepare if we are going to power off the system */
+-		return acpi_sleep_prepare(ACPI_STATE_S5);
+-	}
+-	return 0;
++	return acpi_sleep_prepare(ACPI_STATE_S5);
+ }
+ 
+ static struct sysdev_class acpi_sysclass = {
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.13-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.13-r1.ebuild
new file mode 100644
index 000000000000..9ba71d3fc7ca
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.13-r1.ebuild
@@ -0,0 +1,73 @@
+# 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-r1.ebuild,v 1.1 2005/08/30 10:41:58 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-rc4"
+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}/linux-2.6.13-poweroff.patch"
+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
+
+	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
+}