sys-power/s2ram: Fix CONFIG_CHECK for 2.6.23+ kernels

svn path=/sunrise/; revision=5064

diff --git a/sys-power/s2ram/ChangeLog b/sys-power/s2ram/ChangeLog
index f659e53d52b2862338a7bc07edcad91da082f9ab..93cfcb32d63e074dd1f0f79ba3c9a0ee1a4d08ec 100644 (file)
--- a/sys-power/s2ram/ChangeLog
+++ b/sys-power/s2ram/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2007; Jakub Moc <jakub@gentoo.org> s2ram-0.5.ebuild:
+  Fix CONFIG_CHECK for 2.6.23+ kernels
+
   10 Mar 2007; Jakub Moc <jakub@gentoo.org> s2ram-0.5.ebuild:
   Another thing broken by the retarded pciutils zlib USE flag
 

diff --git a/sys-power/s2ram/Manifest b/sys-power/s2ram/Manifest
index 0f3e0db3a20e531f588a51be43ce39cfc4904da2..e36762c988f2e272898fde70708e752539ca9588 100644 (file)
--- a/sys-power/s2ram/Manifest
+++ b/sys-power/s2ram/Manifest
@@ -1,4 +1,4 @@
 DIST suspend-0.5.tar.gz 163148 RMD160 8b38fcb18c7f860b4c292a4329f268bce6dc177a SHA1 6fbcb41ec5bcae277cc6fd6a95d85709e3bfc5a6 SHA256 ab87f1ee097dab98b4d56f98c95779a47a859de81512292743213e6bd5a352f1
-EBUILD s2ram-0.5.ebuild 1925 RMD160 0b9b69f484a5b232d30d7e6ea4265438e93e159b SHA1 8482f3c17e3e60831f45fdc42c0a30038ec70b8a SHA256 27908ae290aca520fe5b68ae5ab9794cb3017d113cc7db7659b417d4e320eb19
-MISC ChangeLog 326 RMD160 8cf1ae9c674f60fd48d3e4b35989c8e662039a03 SHA1 fd2873fc9fab510d7c75802eb1d23ea958688d52 SHA256 8d4e7b26f29f73d0ea88975ea7f626ed684d692a1e464ed8b9519a9421bd3330
+EBUILD s2ram-0.5.ebuild 1855 RMD160 c8f5da8cdec629d9283059903f28569114617f58 SHA1 29d2f12e5725bfa7d014e03be1e704ee50cae0af SHA256 fe8bf3054cee8f3045d9072da6af5ebcfabd3606a3de9cecc5b1c1ca3b75e29e
+MISC ChangeLog 428 RMD160 a350fca4aee24c53fc2b0d11f49b6e58f5dc205e SHA1 f848ed273dc8305c1c0b01923064a4cba1047207 SHA256 fd073da385cda8919c6b006ebd735a479a8e254ee2f4fb32767f13728599a651
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/sys-power/s2ram/s2ram-0.5.ebuild b/sys-power/s2ram/s2ram-0.5.ebuild
index 50a73ab9102d4b9dbc26b2f31fddb3b84af372ba..ed03d9c2e2525420ba2289eb8d2d22310b701f85 100644 (file)
--- a/sys-power/s2ram/s2ram-0.5.ebuild
+++ b/sys-power/s2ram/s2ram-0.5.ebuild
@@ -20,10 +20,6 @@ RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
-CONFIG_CHECK="SOFTWARE_SUSPEND"
-ERROR_SOFTWARE_SUSPEND="The kernel has to be configured to support software suspend.
-Set CONFIG_SOFTWARE_SUSPEND=y and recompile your kernel."
-
 src_unpack() {
        unpack ${A}
        cd "${S}"
@@ -43,6 +39,12 @@ pkg_setup() {
                        die "You MUST build pciutils without the zlib USE flag"
                fi
        fi
+       
+       if kernel_is lt 2 6 23 ; then
+               CONFIG_CHECK="SOFTWARE_SUSPEND"
+       else
+               CONFIG_CHECK="HIBERNATION"
+       fi
 
        linux-info_pkg_setup
 }