From 68dd34e4fd6b74867102826eb0d266d612cbc677 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Wed, 28 Feb 2007 19:10:29 +0000 Subject: [PATCH] =?utf8?q?Fixups=20for=20suspend2-2.6.19,=20bug#168728,=20?= =?utf8?q?thanks=20to=20=C3=81kos=20Mar=C3=B3y=20Package-Manager:=20portag?= =?utf8?q?e-2.1.2-r12?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- sys-kernel/suspend2-sources/ChangeLog | 8 ++- sys-kernel/suspend2-sources/Manifest | 20 +++++-- .../files/digest-suspend2-sources-2.6.19-r3 | 12 ++++ .../files/suspend2-2.2.9-fixups.patch | 10 ++++ .../suspend2-sources-2.6.19-r3.ebuild | 59 +++++++++++++++++++ 5 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.19-r3 create mode 100644 sys-kernel/suspend2-sources/files/suspend2-2.2.9-fixups.patch create mode 100644 sys-kernel/suspend2-sources/suspend2-sources-2.6.19-r3.ebuild 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 + +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/Manifest b/sys-kernel/suspend2-sources/Manifest index f752afbc3711..8a09e3528d6f 100644 --- a/sys-kernel/suspend2-sources/Manifest +++ b/sys-kernel/suspend2-sources/Manifest @@ -1,3 +1,7 @@ +AUX suspend2-2.2.9-fixups.patch 376 RMD160 e535c4b88b7255f9f3cefaf92b0b85645187f55c SHA1 1b192478b47b3968aa30adb47e36d7da4ad03c98 SHA256 c23567a550465ac0288f9feda973e9932d94fcd9c7d8ff125a52b97f0745b673 +MD5 c8da26201af4c230c758ed9b31e857c5 files/suspend2-2.2.9-fixups.patch 376 +RMD160 e535c4b88b7255f9f3cefaf92b0b85645187f55c files/suspend2-2.2.9-fixups.patch 376 +SHA256 c23567a550465ac0288f9feda973e9932d94fcd9c7d8ff125a52b97f0745b673 files/suspend2-2.2.9-fixups.patch 376 AUX suspend2-2.2.9.7-kunmapping.patch 659 RMD160 04c6165b6e947e0e01ace6bbc7ee9affa14b365f SHA1 f5301c11d73f95b0ff4a07fd788da929ea6d1188 SHA256 d7513571cc037a5b5c10cdfbfb752c097003249c51cfc8bfe2e09fe9e9ce2fc4 MD5 c71f24659ec5286798989280fd713a39 files/suspend2-2.2.9.7-kunmapping.patch 659 RMD160 04c6165b6e947e0e01ace6bbc7ee9affa14b365f files/suspend2-2.2.9.7-kunmapping.patch 659 @@ -19,6 +23,7 @@ DIST linux-2.6.19.tar.bz2 42733268 RMD160 75dc65b15cf9cdb359b1abe7084907982c1908 DIST linux-2.6.20.tar.bz2 43375937 RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 SHA1 e730979adfb287528263e779c91284659672510d SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 DIST suspend2-2.2.9-for-2.6.18.3.patch.bz2 100843 RMD160 be5e16c5f94c86421e449a17b48cd3e37dcbd4cb SHA1 e49b9b3b61578e5aba425b03d195a00733211ba4 SHA256 c9e777abed291db0b85dea73b0582fdf04dffd5b81ee0be8bd870e90877be364 DIST suspend2-2.2.9-for-2.6.19-rc6.patch.bz2 100596 RMD160 7c27f1d1514a30a410b779c61c8ffad7fe231369 SHA1 f1c27074cabb1ebdb068d1af6aaa188f57119807 SHA256 3321c0004016fcb4b1e490fd42f98f6855c475baa8bcb21917481dadc1af638a +DIST suspend2-2.2.9-for-2.6.19.patch.bz2 98896 RMD160 e1297ded61ee4f19d913611545a14fbca205bbfd SHA1 4c5e58962a73f22b215b6730d7640ffcc82c3cc8 SHA256 e815da754f8d865ebdd73b9d732388b32ece8389afe1fe47358ed68252a2d2ba DIST suspend2-2.2.9.7-for-2.6.20.patch.bz2 103822 RMD160 12c52a39dc11fce72875f1c4662369cc99590735 SHA1 d14dfc2c69fb5cf2c96488e9545e5535b7baf704 SHA256 58884db7f3560b89ffd9c81ff2416e822bd8acc54553f08f4cfc1bb698e7b2d9 EBUILD suspend2-sources-2.6.18-r1.ebuild 1668 RMD160 7ed45e4400a092e9cd55b789e947e28a506970ea SHA1 f2a419648555119a1943d2cdc52b348a72782dde SHA256 36c4b43ab882eb7417a7f9cccaa936877649c48d57151666059f865a1d6e0aa1 MD5 7334b48147cfc4030da699aab5c1cb36 suspend2-sources-2.6.18-r1.ebuild 1668 @@ -32,14 +37,18 @@ EBUILD suspend2-sources-2.6.19-r2.ebuild 1705 RMD160 e31f51b7db842905dc60b14a35c MD5 fe3a7aa206eb5dac407b7449a84557bb suspend2-sources-2.6.19-r2.ebuild 1705 RMD160 e31f51b7db842905dc60b14a35c7836421b636cc suspend2-sources-2.6.19-r2.ebuild 1705 SHA256 34eeb2291c1af15f65d81730ac5507a1da6be2c54cd9a2cad5fcb56b53da7b49 suspend2-sources-2.6.19-r2.ebuild 1705 +EBUILD suspend2-sources-2.6.19-r3.ebuild 1756 RMD160 75ccb521fb8b1c598e08e5f9886b52fd0b922499 SHA1 123340189f92aa9d6edc9fbae2163ddc4cbf1405 SHA256 17f02d49a360505f1aae30caac977e761721fe7ee0d4767b665f12b4dbd5d37c +MD5 ed8950498b15f832df1faf217fb9fe5a suspend2-sources-2.6.19-r3.ebuild 1756 +RMD160 75ccb521fb8b1c598e08e5f9886b52fd0b922499 suspend2-sources-2.6.19-r3.ebuild 1756 +SHA256 17f02d49a360505f1aae30caac977e761721fe7ee0d4767b665f12b4dbd5d37c suspend2-sources-2.6.19-r3.ebuild 1756 EBUILD suspend2-sources-2.6.20.ebuild 1764 RMD160 444353068a853a2878360526b9bdb4cf10f70f5b SHA1 7ab6564d29b2f935bc0b27f6f43947ab5844b8cd SHA256 0d35f0a54b6fbd108a948e852c382dd18abe58ea08f3b93a5ed6e521ac3bfd2b MD5 532c4152d1f055d92e7cc40b4cf131fe suspend2-sources-2.6.20.ebuild 1764 RMD160 444353068a853a2878360526b9bdb4cf10f70f5b suspend2-sources-2.6.20.ebuild 1764 SHA256 0d35f0a54b6fbd108a948e852c382dd18abe58ea08f3b93a5ed6e521ac3bfd2b suspend2-sources-2.6.20.ebuild 1764 -MISC ChangeLog 20467 RMD160 528883756bb1c016a5caafdcaca1bc7a794c3056 SHA1 460ab38880e9f1222af5e6e528f8fbd86e02a484 SHA256 534779ed41365145cd372032564a4de7ea269628107a27f1acc16851ee7c785c -MD5 846d0a53a70c49e345ccd51402b52a70 ChangeLog 20467 -RMD160 528883756bb1c016a5caafdcaca1bc7a794c3056 ChangeLog 20467 -SHA256 534779ed41365145cd372032564a4de7ea269628107a27f1acc16851ee7c785c ChangeLog 20467 +MISC ChangeLog 20698 RMD160 1c7fb3fbdf77c76fb23dc2d459510fbba58d061f SHA1 e3b9835d6544c4fc693ded7bf1c4bf3a921913fc SHA256 4c8ed8b44d489c6765e339b723d138b6dceca69d0b36008f04b1167a03cb9aeb +MD5 f600b97aa7913c661def4bf235ae80fc ChangeLog 20698 +RMD160 1c7fb3fbdf77c76fb23dc2d459510fbba58d061f ChangeLog 20698 +SHA256 4c8ed8b44d489c6765e339b723d138b6dceca69d0b36008f04b1167a03cb9aeb ChangeLog 20698 MISC metadata.xml 269 RMD160 6153fff8b8ea0cdbdf6375aec0de85d7b9fd57f3 SHA1 7120c0e72ed1d0ad61e416cdcd013a2390880640 SHA256 4b5337bb81db762bebe9e6ef3c2355aa172ffa553effe4940fd0141a85158eaf MD5 b52ea8e392f4fb6d24f937ca7bbd3c85 metadata.xml 269 RMD160 6153fff8b8ea0cdbdf6375aec0de85d7b9fd57f3 metadata.xml 269 @@ -53,6 +62,9 @@ SHA256 d6fe561fa9ecee3441d66c4bbd5c478c5ff0d2c4a2a544d3a77115ab5022ed1c files/di MD5 f5b635ad07da11a11d80cdaa67e60f1b files/digest-suspend2-sources-2.6.19-r2 1102 RMD160 39c27fd511c61c966b2c9770221846f528d3ee15 files/digest-suspend2-sources-2.6.19-r2 1102 SHA256 e53a6ba340ca409db77f067181b8dbecb66b67eb9d1fde741c88464a5a1420e3 files/digest-suspend2-sources-2.6.19-r2 1102 +MD5 b16e182aabe1cc31b46fc5167073c6ae files/digest-suspend2-sources-2.6.19-r3 1087 +RMD160 ba5de9950aee6552841c5c7af82b919426c9b816 files/digest-suspend2-sources-2.6.19-r3 1087 +SHA256 9d72178257698bbc44d915e08dde771cbc7ea0134f1956a36cbd41721b636948 files/digest-suspend2-sources-2.6.19-r3 1087 MD5 b5596a226fa95dfad4c49c65094532ef files/digest-suspend2-sources-2.6.20 1093 RMD160 7a5a150c3c8bdadfba24a56cead07ba761b6b627 files/digest-suspend2-sources-2.6.20 1093 SHA256 338de2a6cb5840d3dfb12c4dad08f94f56322578c5d8e8c40fe28fa2d4a62f1f files/digest-suspend2-sources-2.6.20 1093 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 + #include + #include ++#include + #include + #include + 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 +} -- 2.26.2