Fixups for suspend2-2.6.19, bug#168728, thanks to Ákos Maróy

(Portage version: 2.1.2-r12)

4 files changed, 88 insertions, 1 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index 5fd400988677..ab4263c083cd 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.82 2007/02/09 21:37:57 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.83 2007/02/28 19:10:29 alonbl Exp $
+
+*suspend2-sources-2.6.19-r3 (28 Feb 2007)
+
+  28 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/suspend2-2.2.9-fixups.patch, +suspend2-sources-2.6.19-r3.ebuild:
+  Fixups for suspend2-2.6.19, bug#168728, thanks to Ákos Maróy
 
 *suspend2-sources-2.6.20 (09 Feb 2007)
 
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r3 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r3
new file mode 100644
index 000000000000..47a3d9fde938
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r3
@@ -0,0 +1,12 @@
+MD5 613939a77a6fe3c426d0be13f7ac6ba5 genpatches-2.6.19-7.base.tar.bz2 53619
+RMD160 6281b30ef2d7805555fecd1566d91d445f418301 genpatches-2.6.19-7.base.tar.bz2 53619
+SHA256 c0d20d01440b67d91bfe6bc08b979eb9ed56076f3cab7a41c9055edfd5346fdf genpatches-2.6.19-7.base.tar.bz2 53619
+MD5 7deed166c22f2bc1c63102e1eaec65e8 genpatches-2.6.19-7.extras.tar.bz2 145332
+RMD160 b0592a9572fb4395dbf0d4a3b4a61210d2e37f56 genpatches-2.6.19-7.extras.tar.bz2 145332
+SHA256 b149770e7cca9ad866772eccac89c795f8fba5751f6da48cd682d8d0e5da4682 genpatches-2.6.19-7.extras.tar.bz2 145332
+MD5 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 42733268
+RMD160 75dc65b15cf9cdb359b1abe7084907982c19088b linux-2.6.19.tar.bz2 42733268
+SHA256 c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58 linux-2.6.19.tar.bz2 42733268
+MD5 d63eb4896e8e8203069f098025a434e8 suspend2-2.2.9-for-2.6.19.patch.bz2 98896
+RMD160 e1297ded61ee4f19d913611545a14fbca205bbfd suspend2-2.2.9-for-2.6.19.patch.bz2 98896
+SHA256 e815da754f8d865ebdd73b9d732388b32ece8389afe1fe47358ed68252a2d2ba suspend2-2.2.9-for-2.6.19.patch.bz2 98896
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2.9-fixups.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2.9-fixups.patch
new file mode 100644
index 000000000000..e2a92e1ac938
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2.9-fixups.patch
@@ -0,0 +1,10 @@
+--- linux-2.6.19-suspend2-r2/drivers/usb/atm/ueagle-atm.c.org	2007-02-28 21:02:55.000000000 +0200
++++ linux-2.6.19-suspend2-r2/drivers/usb/atm/ueagle-atm.c	2007-02-28 21:03:42.000000000 +0200
+@@ -63,6 +63,7 @@
+ #include <linux/ctype.h>
+ #include <linux/kthread.h>
+ #include <linux/version.h>
++#include <linux/freezer.h>
+ #include <linux/mutex.h>
+ #include <asm/unaligned.h>
+ 
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r3.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r3.ebuild
new file mode 100644
index 000000000000..25b39e9fe5c1
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r3.ebuild
@@ -0,0 +1,59 @@
+# 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.19-r3.ebuild,v 1.1 2007/02/28 19:10:29 alonbl 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.2.9"
+SUSPEND2_TARGET="2.6.19"
+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
+	${FILESDIR}/${P}-vesafb.patch
+	${FILESDIR}/suspend2-${SUSPEND2_VERSION}-fixups.patch"
+UNIPATCH_STRICTORDER="yes"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ultra1"
+RDEPEND="${RDEPEND}
+		~sys-apps/suspend2-userui-0.6.4
+		>=sys-power/hibernate-script-1.93-r6"
+
+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_setup() {
+	if use sparc; then
+		# hme lockup hack on ultra1
+		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1705_sparc-U1-hme-lockup.patch"
+	fi
+}
+
+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
+}