Depend on sys-power/hibernate-script or sys-power/pm-utils (bug #334971).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 42 insertions, 22 deletions

diff --git a/sys-kernel/tuxonice-sources/ChangeLog b/sys-kernel/tuxonice-sources/ChangeLog
index b6c08b9b81a5..3de1b10c1410 100644
--- a/sys-kernel/tuxonice-sources/ChangeLog
+++ b/sys-kernel/tuxonice-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/tuxonice-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.93 2010/08/28 09:13:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.94 2010/08/31 09:51:06 nelchael Exp $
+
+  31 Aug 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+  tuxonice-sources-2.6.34.ebuild, tuxonice-sources-2.6.34-r1.ebuild,
+  tuxonice-sources-2.6.34-r2.ebuild, tuxonice-sources-2.6.35.ebuild,
+  tuxonice-sources-2.6.35-r1.ebuild:
+  Depend on sys-power/hibernate-script or sys-power/pm-utils (bug #334971).
 
 *tuxonice-sources-2.6.35-r1 (28 Aug 2010)
 
diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest
index 0ba5d9952c85..8afb0774c322 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST current-tuxonice-for-2.6.30.patch-20090620-v1.bz2 114215 RMD160 835a301d27035f7ed030686308471a2b3b3d4346 SHA1 664df5a7c3c776835e2408b15d1966fac6e3ac7c SHA256 0c2c7969751625da59f02284bc346116a6e6a52b1b3e258cedc317bc0a16977f
 DIST current-tuxonice-for-2.6.35.patch-20100815-v1.bz2 126093 RMD160 2d0c9092e7b9ea1531885b34420ee2d933deb2e9 SHA1 7c9e22f324a3c15954e15cc272cb201a8a4a791c SHA256 f7f17edbb97462826814166620386cfa6dd65e1f6751748e135202f404c7f19d
 DIST deblob-2.6.30 79041 RMD160 7671b56dd4357eba1aa8097f02b5d7ccc9c86422 SHA1 c282c2c77d38618da7ac8fc5adb0663a0d4bdaa3 SHA256 e1f6ba1eec8ea0de1c4099a066512dfbc53ca5c6527e7593ba0d4e85b36b626d
@@ -76,10 +79,21 @@ EBUILD tuxonice-sources-2.6.33-r1.ebuild 1441 RMD160 c2234fb1ea9aa95428a0f8f41eb
 EBUILD tuxonice-sources-2.6.33-r2.ebuild 1441 RMD160 de65639a66c6a4ea52dde9665d64805544a17ff4 SHA1 899d2bcf4f81081f8d86690d78ba524186d814ac SHA256 177087f3fe79190683df33d6ac307ea9095f13e26b421ac8ec04a5825659292d
 EBUILD tuxonice-sources-2.6.33-r3.ebuild 1445 RMD160 d17625f19a9666639073bdc01b253a3458a2dad0 SHA1 1ab5e54892f2eed18579b06cae15722f4a3b1a8c SHA256 741e59b6c38f7e994a4f2d94fa13cedc89c1f69194351be8d66bc226273dce6a
 EBUILD tuxonice-sources-2.6.33-r4.ebuild 1445 RMD160 dbb0dc3b6e19365e251c4b305cf4573c54d4a70a SHA1 d0bae63dd65cb3234ac1765339c05ef55f7095d2 SHA256 d65c3e163a15e97eb0858fde1c56b28033b50275c5c8562b7d76964f4672b31d
-EBUILD tuxonice-sources-2.6.34-r1.ebuild 1445 RMD160 6fa2f36969fd550d1ff07dfc8e55e0a549acefe9 SHA1 61443157c32aa49eec5f2c5084116856dd55732e SHA256 56f557bdba10e275e7dbdb1914c7017edc5072412afcb68b743fd14f22c84afb
-EBUILD tuxonice-sources-2.6.34-r2.ebuild 1445 RMD160 244751dad70c33502025e71143ad74f7ab1a4f22 SHA1 3b7bfecbae0d2a3d3e6f37d58c8a5284383d9f24 SHA256 a13157852b1e22ac9643792c6e9e3e3226660697826e765b373752517f3387c2
-EBUILD tuxonice-sources-2.6.34.ebuild 1442 RMD160 60c14790e322ef9581b073bdacb70727d04bb7d9 SHA1 352de75f413fa5337d851f75c13f15b76680d71a SHA256 35911ba274a752889fdc7327a475264a790d69bec13b6c589d9e2b43bf204c60
-EBUILD tuxonice-sources-2.6.35-r1.ebuild 1446 RMD160 a3e72a3d2a31089b7e7fe987cff3759217031dd2 SHA1 0864e80efe5067eb2802ee80270b5a5647cf0c19 SHA256 dccebc75d0f5ac7287ff0494851e70de079e25c9776ff285acd46fdaa013cacf
-EBUILD tuxonice-sources-2.6.35.ebuild 1446 RMD160 d060edf56bca7dd7eef88e49cf514a503fe44029 SHA1 199d27d80b10257f5f226a1715f4ab1cbe51e031 SHA256 e8c66f1212de6883eed3a1114a67535957a9dba39b7641fc52017ed20d7e8ad0
-MISC ChangeLog 45155 RMD160 944d08eec9760b36156f9896b57fc29fa4ac35c4 SHA1 430a496802bd2cdbccf78476cc092883a75e25e6 SHA256 f99a73154890248276aa3b7154d7a7d70fa290da8c941e4f96cc48dfe6ba6274
+EBUILD tuxonice-sources-2.6.34-r1.ebuild 1469 RMD160 13e8dfe28609693779dd7cb90035d0ae61a95169 SHA1 c737383ccf0bb2f02478bf9b7b0992b5ce461a64 SHA256 666b1c679883529e4588f405ba422c49f7fb72f9f5e87aeeb20c1f21609c4fe7
+EBUILD tuxonice-sources-2.6.34-r2.ebuild 1469 RMD160 a7cd74faa434494ddfd277defccef4a7965cd0f7 SHA1 65660fb468d9726b21427f859cf73e556f36bacc SHA256 86e33456fef66fd212f144f0e537e0532adc0617d7d434e7d2a321f7dde6807f
+EBUILD tuxonice-sources-2.6.34.ebuild 1466 RMD160 8ea04560fe780e208e5d65e5eb1a9936d742869c SHA1 3b9494144b777369c084cc7c6f71dc541df7e145 SHA256 d9b284beddebd4dabca98747f97a3d78ea3dddac8fbf19f3a62f4719a91d8efb
+EBUILD tuxonice-sources-2.6.35-r1.ebuild 1469 RMD160 d4fd44d27f88098af12491154086aa59edb6be72 SHA1 7f53c95b2d7c18915442d3a117d0d7e35b1bfdaa SHA256 d6e38d19e1384a4f0dbc9034a47dfaecd168fe311c6baed1087341174f823d7a
+EBUILD tuxonice-sources-2.6.35.ebuild 1470 RMD160 532cc7ff3912fd6d4e31c569ba17b5253c076151 SHA1 b76b9ccc0108ff06b5c00bbc8a16bf63e1e95cfe SHA256 688865401d03e2bdd02d638c820de691a2462d50d0bcbc2976b035161208fa55
+MISC ChangeLog 45460 RMD160 67bd7b8c181fbd997dd4abe0d7428d29ec8a9e03 SHA1 fb6a4a06d9bce2ce44fb5f30eab6e195fd250a75 SHA256 fbc81b6d1a1346ec838b59ccd2fc53182bc28e5d69e97437621ff44168164984
 MISC metadata.xml 406 RMD160 7657b2dc5911785eeaed11d7fc040f6665425622 SHA1 94a2c46361473ba3ce9935e633fe268405f13bd6 SHA256 c825d7e7e60c9925492be65771f3ac1212a4eda0248e3a89ace97304e8b4bd13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMfNCgAAoJEBZyv1r2qA5G2aEIAIl/hkR3Q5bWSUGIttIWXwME
+jPwKmiBtOBLiuQ/RLmMXbPld7DyVG51AvBbecG8oPPCLp0lLYTdoPosLUHspQsWw
+v2FqXJZqfrarBakSYJjDz71VRpXXXGSSjAwJxt9lEJJbkDlPDL3DFy9MZ0jpp4Ra
+zEbGB36WUZleSpd/VttfDH6V5gdth4RSq0OGA5TpeAWGi1ZCawo9+83+iVKsi2E3
+4gAS2SVoIp1RQXVV6ZP5trGfUnD5EwnqxHDlPagTCQAmCR/IckszL1GkuQAS39wc
+Vch8A5RaYauY4O1IBJe/hqIzqm+0bvrmKUtvquBg39tcJECeaRTZFA/DCMVBdlU=
+=c3S4
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r1.ebuild
index c9e91f67b6c3..1998ea3fd7a1 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r1.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r1.ebuild,v 1.1 2010/07/13 08:11:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r1.ebuild,v 1.2 2010/08/31 09:51:06 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -33,8 +33,8 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${RDEPEND}
-		>=sys-apps/tuxonice-userui-1.0
-		>=sys-power/hibernate-script-2.0"
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
 
 K_EXTRAELOG="If there are issues with this kernel, please direct any
 queries to the tuxonice-users mailing list:
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r2.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r2.ebuild
index ea087a71a040..38cd7a1aa35e 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r2.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r2.ebuild,v 1.1 2010/08/19 13:50:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34-r2.ebuild,v 1.2 2010/08/31 09:51:06 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -33,8 +33,8 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${RDEPEND}
-		>=sys-apps/tuxonice-userui-1.0
-		>=sys-power/hibernate-script-2.0"
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
 
 K_EXTRAELOG="If there are issues with this kernel, please direct any
 queries to the tuxonice-users mailing list:
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34.ebuild
index e97fcb13a913..ec252115de19 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34.ebuild,v 1.1 2010/06/23 19:19:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.34.ebuild,v 1.2 2010/08/31 09:51:06 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -33,8 +33,8 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${RDEPEND}
-		>=sys-apps/tuxonice-userui-1.0
-		>=sys-power/hibernate-script-2.0"
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
 
 K_EXTRAELOG="If there are issues with this kernel, please direct any
 queries to the tuxonice-users mailing list:
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35-r1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35-r1.ebuild
index 7787d1b0d0fc..07cf51bdfdc0 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35-r1.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35-r1.ebuild,v 1.1 2010/08/28 09:13:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35-r1.ebuild,v 1.2 2010/08/31 09:51:06 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -33,8 +33,8 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${RDEPEND}
-		>=sys-apps/tuxonice-userui-1.0
-		>=sys-power/hibernate-script-2.0"
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
 
 K_EXTRAELOG="If there are issues with this kernel, please direct any
 queries to the tuxonice-users mailing list:
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35.ebuild
index e841418332dc..89391e23e506 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35.ebuild,v 1.1 2010/08/20 09:22:24 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.35.ebuild,v 1.2 2010/08/31 09:51:06 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -33,8 +33,8 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${RDEPEND}
-		>=sys-apps/tuxonice-userui-1.0
-		>=sys-power/hibernate-script-2.0"
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
 
 K_EXTRAELOG="If there are issues with this kernel, please direct any
 queries to the tuxonice-users mailing list: