Revbump + vesafb patch, closes bug#157705, thanks to Christian Schlotter

Package-Manager: portage-2.1.1-r2

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index 6d1d50dbcbd7da4f3719cdf0595fbc16fc6f77c0..379a0f733855807079481bd975103c11c39d1d8f 100644 (file)
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/suspend2-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.75 2006/12/16 21:26:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.76 2006/12/17 20:00:28 alonbl Exp $
+
+*suspend2-sources-2.6.19-r1 (17 Dec 2006)
+
+  17 Dec 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/suspend2-sources-2.6.19-vesafb.patch,
+  +suspend2-sources-2.6.19-r1.ebuild:
+  Revbump + vesafb patch, closes bug#157705, thanks to Christian Schlotter
 
   16 Dec 2006; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml:
   Modify maintainer

diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest
index c24dfc970f4400efa456f680ee5040d635845aa0..8a04556e12d1e403af0502452764a9624d9c85e1 100644 (file)
--- a/sys-kernel/suspend2-sources/Manifest
+++ b/sys-kernel/suspend2-sources/Manifest
@@ -1,3 +1,7 @@
+AUX suspend2-sources-2.6.19-vesafb.patch 356 RMD160 d2d18c5bc34185715f038d9bfd4c2763ecb22dfd SHA1 1e1f62e2dcf121591979438a4adcc016e7b055de SHA256 6097095d09ff90e8d1c77c13ae3d18a453b1bc27d2db1c7bc591c19b1e8a233f
+MD5 f53cbe2172b597119c8788acb2d4b680 files/suspend2-sources-2.6.19-vesafb.patch 356
+RMD160 d2d18c5bc34185715f038d9bfd4c2763ecb22dfd files/suspend2-sources-2.6.19-vesafb.patch 356
+SHA256 6097095d09ff90e8d1c77c13ae3d18a453b1bc27d2db1c7bc591c19b1e8a233f files/suspend2-sources-2.6.19-vesafb.patch 356
 DIST genpatches-2.6.16-11.base.tar.bz2 89674 RMD160 a92262be88f8a75496ed659f16f7c7ee1dffb1eb SHA1 01e8607f9ee09e9b5f1980aedbb57f1974d15562 SHA256 85c9084e4303c452784e8a7b726482c34e25eed4c9a8982e683397f4a2849111
 DIST genpatches-2.6.16-11.extras.tar.bz2 137758 RMD160 4800c6612a3d9f1c2d7f4af923ae5c254416fbcb SHA1 29ed0dd9dc7965b4755048792eee33aea38d5311 SHA256 6ce07f500b9b76a988d2384cb7fd73dda70543f9a6429f5ffea1ea737c534fad
 DIST genpatches-2.6.16-15.base.tar.bz2 98632 RMD160 46e8cfcae8fea262d7599c2e4d3e7fbc8af239b2 SHA1 e0f253ad01a4da388675af4b90223289d9bcd578 SHA256 fb78f2a4d32d1770a34d9ee254686a6a12102fa99c1bb73e9c282ab5f82dddaa
@@ -12,6 +16,8 @@ DIST genpatches-2.6.18-6.base.tar.bz2 96657 RMD160 b5007a574bf4fd697a7a9e147b4c3
 DIST genpatches-2.6.18-6.extras.tar.bz2 143244 RMD160 bad2fb4772dac2c134e8e8f6736eb31ac458137d SHA1 c8d2afaf40601f89aa6db2c2e8abb0c4cf556812 SHA256 fea0de9b4622b94a44e5637cfcb60bf47673e55f39a2146bc7af791d4611731c
 DIST genpatches-2.6.19-1.base.tar.bz2 2094 RMD160 85c472878cdbb4f1224e3c92838c117efe72982c SHA1 a1cd77063f3d712f907b78e0371ec6160040dfb4 SHA256 72449c4be0bdd71986200e2729782b42aec7cf41149f0d9e7f08d2caec053521
 DIST genpatches-2.6.19-1.extras.tar.bz2 139875 RMD160 4e418ab59a29ec38852a45ee1c8e2974c0b9de6d SHA1 0bc774dcc3c2c6bc15963126bf693032b0bed45f SHA256 562b5009efbcc2d17fd5f8fbd0ef5eaeccd542a775960050ce6ca751720331cf
+DIST genpatches-2.6.19-3.base.tar.bz2 15941 RMD160 44db8c27990e978fe9116a49388eda610a473977 SHA1 d42492b304b2d1140ae432de317f01c651363ff4 SHA256 6af4f94b8cea0c86bda44ae9666a23f6e6666f1fc353f7fd0801c6cb5837b762
+DIST genpatches-2.6.19-3.extras.tar.bz2 139459 RMD160 9b3dd25b781854feab0d325cc4327e7035fef60b SHA1 1210eed0c0b4ee825e449349b3c7544d9c96721b SHA256 9900288ef68f9c9f93fab4659a4eb2c50d3a3b0ee64e457d9aafee642cd7be19
 DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
 DIST linux-2.6.17.tar.bz2 41272919 RMD160 26aad30c9a6610665c6c7d62401d79bf56a6a699 SHA1 0605c975b9dead2af31a3decf09dd4138fadaf2b SHA256 ab0f647d52f124958439517df9e1ae0efda90cdb851f59f522fa1749f1d87d58
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
@@ -45,14 +51,18 @@ EBUILD suspend2-sources-2.6.18.ebuild 1617 RMD160 24a8c1d0b5ec1f662d4266ed25f4d0
 MD5 b86fd046f3d2ea35e50d3c3622a43436 suspend2-sources-2.6.18.ebuild 1617
 RMD160 24a8c1d0b5ec1f662d4266ed25f4d0cfa1a6fa2c suspend2-sources-2.6.18.ebuild 1617
 SHA256 708c9ef2cc84f4036806dec30d4561bade53ead0514c1922bbc2e75a660af944 suspend2-sources-2.6.18.ebuild 1617
+EBUILD suspend2-sources-2.6.19-r1.ebuild 1706 RMD160 84607669b386cd7cecab5805169b75b5b5d11216 SHA1 ab6a8306c76fd50dc870946c9fdf21e5d1390da0 SHA256 cf7efbd484b00ca0e9a6c88f7610387873166551cbc4ddb35d7ac9d411d3e152
+MD5 880439b225ca4e4dc94a66a921809672 suspend2-sources-2.6.19-r1.ebuild 1706
+RMD160 84607669b386cd7cecab5805169b75b5b5d11216 suspend2-sources-2.6.19-r1.ebuild 1706
+SHA256 cf7efbd484b00ca0e9a6c88f7610387873166551cbc4ddb35d7ac9d411d3e152 suspend2-sources-2.6.19-r1.ebuild 1706
 EBUILD suspend2-sources-2.6.19.ebuild 1669 RMD160 14634da14ba4303e37ff933fd83ab96f7933028c SHA1 15e8191e0d74390de18638136b0d8527848f7222 SHA256 d713e38214daa522fd28f2733671bdadf9deeb5d4258616e5c2d76512993e5c3
 MD5 7a6ac1252b713096310b70e45bb2d8e4 suspend2-sources-2.6.19.ebuild 1669
 RMD160 14634da14ba4303e37ff933fd83ab96f7933028c suspend2-sources-2.6.19.ebuild 1669
 SHA256 d713e38214daa522fd28f2733671bdadf9deeb5d4258616e5c2d76512993e5c3 suspend2-sources-2.6.19.ebuild 1669
-MISC ChangeLog 18929 RMD160 51980a61019c8db970d22815470c1bd78e9e2cc8 SHA1 3bbf0ace1e3f3bfc722675436c095a5a60b0bbbf SHA256 810a399c32eaf7e306b26c53bd0610c8d8f99e3d535be48ab1bd3c32b4028841
-MD5 052dd2ab21d0f94ec850bd30bec3c01c ChangeLog 18929
-RMD160 51980a61019c8db970d22815470c1bd78e9e2cc8 ChangeLog 18929
-SHA256 810a399c32eaf7e306b26c53bd0610c8d8f99e3d535be48ab1bd3c32b4028841 ChangeLog 18929
+MISC ChangeLog 19181 RMD160 42a54e150ab8de681d7b7b792fe1404b45892bc2 SHA1 6fbf7cf5c38744ccbd7f4fc7ad4a7f925d226fdc SHA256 481c42662508b402707a3be1fb57135884f61e3004b6f1fc66535cf10d652a77
+MD5 e080bc76bd69e07556ff5d0aa047133a ChangeLog 19181
+RMD160 42a54e150ab8de681d7b7b792fe1404b45892bc2 ChangeLog 19181
+SHA256 481c42662508b402707a3be1fb57135884f61e3004b6f1fc66535cf10d652a77 ChangeLog 19181
 MISC metadata.xml 269 RMD160 6153fff8b8ea0cdbdf6375aec0de85d7b9fd57f3 SHA1 7120c0e72ed1d0ad61e416cdcd013a2390880640 SHA256 4b5337bb81db762bebe9e6ef3c2355aa172ffa553effe4940fd0141a85158eaf
 MD5 b52ea8e392f4fb6d24f937ca7bbd3c85 metadata.xml 269
 RMD160 6153fff8b8ea0cdbdf6375aec0de85d7b9fd57f3 metadata.xml 269
@@ -78,3 +88,6 @@ SHA256 73b1069dcaa427ca818679f1725ea017c736000ce380e99d56310096c6275bce files/di
 MD5 451f09129b64295e8b7ae6ad5bf19516 files/digest-suspend2-sources-2.6.19 1099
 RMD160 de5b8740d303243c1b02438830fd4e52ad0af02e files/digest-suspend2-sources-2.6.19 1099
 SHA256 a75095cc291b6b2826a23d27610232850d85f0f3a6a0f35aa7789aacb20840eb files/digest-suspend2-sources-2.6.19 1099
+MD5 21c7e7ba06e64b7587aa1c05de46750d files/digest-suspend2-sources-2.6.19-r1 1102
+RMD160 156836410d4a6555dc91a36ca1bd8344ae85d14d files/digest-suspend2-sources-2.6.19-r1 1102
+SHA256 3085b2dd7ae383b456f1b9bf983c9c3dbcbece880a93b081139654f7f40ba8c2 files/digest-suspend2-sources-2.6.19-r1 1102

diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r1
new file mode 100644 (file)
index 0000000..68a0404
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r1
@@ -0,0 +1,12 @@
+MD5 8b778c527e7eb4cffc7cac6106163e63 genpatches-2.6.19-3.base.tar.bz2 15941
+RMD160 44db8c27990e978fe9116a49388eda610a473977 genpatches-2.6.19-3.base.tar.bz2 15941
+SHA256 6af4f94b8cea0c86bda44ae9666a23f6e6666f1fc353f7fd0801c6cb5837b762 genpatches-2.6.19-3.base.tar.bz2 15941
+MD5 a6180931d7b566aa514d532dff0c07f1 genpatches-2.6.19-3.extras.tar.bz2 139459
+RMD160 9b3dd25b781854feab0d325cc4327e7035fef60b genpatches-2.6.19-3.extras.tar.bz2 139459
+SHA256 9900288ef68f9c9f93fab4659a4eb2c50d3a3b0ee64e457d9aafee642cd7be19 genpatches-2.6.19-3.extras.tar.bz2 139459
+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 ce94df22b93c74f1637d2429c1093ec7 suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
+RMD160 7c27f1d1514a30a410b779c61c8ffad7fe231369 suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596
+SHA256 3321c0004016fcb4b1e490fd42f98f6855c475baa8bcb21917481dadc1af638a suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596

diff --git a/sys-kernel/suspend2-sources/files/suspend2-sources-2.6.19-vesafb.patch b/sys-kernel/suspend2-sources/files/suspend2-sources-2.6.19-vesafb.patch
new file mode 100644 (file)
index 0000000..e8f0433
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-sources-2.6.19-vesafb.patch
@@ -0,0 +1,12 @@
+--- drivers/video/vesafb-thread.c~       2006-12-11
+23:30:31.000000000 +0100
++++ drivers/video/vesafb-thread.c        2006-12-11
+23:39:07.000000000 +0100
+@@ -12,6 +12,7 @@
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
++#include <linux/freezer.h>
+ #include <linux/mm.h>
+ #include <linux/delay.h>
+ #include <linux/signal.h>

diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r1.ebuild
new file mode 100644 (file)
index 0000000..90b9fbe
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/12/17 20:00:28 alonbl Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="3"
+
+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-rc6"
+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"
+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.1
+               >=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
+}