diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 10:09:22 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 10:09:22 +0000 |
commit | 9d3c8c4f403681534919a71aea4a6ee2430331a1 (patch) | |
tree | 6e3c50ea68b626f86c92c5b3bad0137a008e5360 /sys-power/pm-utils | |
parent | Don't install conflicting pm-utils hooks wrt #327443. (diff) | |
download | historical-9d3c8c4f403681534919a71aea4a6ee2430331a1.tar.gz historical-9d3c8c4f403681534919a71aea4a6ee2430331a1.tar.bz2 historical-9d3c8c4f403681534919a71aea4a6ee2430331a1.zip |
Block only conflicting laptop-mode-tools wrt #327443.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-power/pm-utils')
-rw-r--r-- | sys-power/pm-utils/ChangeLog | 5 | ||||
-rw-r--r-- | sys-power/pm-utils/Manifest | 4 | ||||
-rw-r--r-- | sys-power/pm-utils/pm-utils-1.4.1.ebuild | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog index 25fbd4b37ce9..60b48829dc58 100644 --- a/sys-power/pm-utils/ChangeLog +++ b/sys-power/pm-utils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-power/pm-utils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.49 2010/07/08 07:39:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.50 2010/07/08 10:09:22 ssuominen Exp $ + + 08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.1.ebuild: + Block only conflicting laptop-mode-tools wrt #327443. 08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.1.ebuild: Don't block sys-power/powermgmt-base anymore if USE="pm-utils" is enabled diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest index 3d1889d5f7a8..df9c5ae2d1b3 100644 --- a/sys-power/pm-utils/Manifest +++ b/sys-power/pm-utils/Manifest @@ -3,6 +3,6 @@ AUX 1.3.0-on_ac_power-upower.patch 2948 RMD160 5ffeff42862ac80eef619bc10391b3d10 DIST pm-utils-1.3.0.tar.gz 197344 RMD160 52d257a5440bbdafd7d814351b9a59deb36536ba SHA1 30f6c0a7f470d2c2874d3b13046c1883363c06f3 SHA256 586cc4a6d40e5d659d9d634ba9d3cde6268a0543fd7f29026a3069bcd726806e DIST pm-utils-1.4.1.tar.gz 208687 RMD160 04798d6d3aa3bbbfbca6dc48037916b425714108 SHA1 9aacb9b4a5f11f751d94f5257c6c54460f106197 SHA256 8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b EBUILD pm-utils-1.3.0-r2.ebuild 1525 RMD160 860395d927a51227374c2b336441034b51803987 SHA1 000cd9979105b54202a49a9d9d9b6b2100811aa8 SHA256 dd7b1d42dc5296e32dedec8b62c481df66c6f9f785eef5c591b47bb051c1119a -EBUILD pm-utils-1.4.1.ebuild 1561 RMD160 5485a2fb22ebf95f837237b5a9c512a445c02081 SHA1 8e64c0d50ad245e7ba3abbe242b9c5f6e2888f37 SHA256 df65546e248386631af5d01ef5280581c9aa464d4574b78da5c06cabdff8c72c -MISC ChangeLog 7684 RMD160 4b5583072084de1a2588b4cbf38e78ae95de5244 SHA1 418b36237e23732a5ba0ef9cb3d349820f4cd237 SHA256 082beb7c206c83c8eb8e46b9cf69ce9f9fe8f890fadb321bc64670d8b70c1d1b +EBUILD pm-utils-1.4.1.ebuild 1570 RMD160 2f2bc5ba08bc986a70393d84df5b2c51b968f1d8 SHA1 066fc11d8fdfd645648e728935ee68a589992df6 SHA256 01604d1067a7f4d95356684ab4293e67dbb477eba3b36e13d958917714788a01 +MISC ChangeLog 7818 RMD160 76127a72dc25b74add2434d7fe74116f29a92db3 SHA1 d1211fd3edb73fd29c260bbec1a7d5ee84439744 SHA256 533f31bede00f6d9a57c0f5820a6a316e4dd4087ab877009f12e37b0dfd675d3 MISC metadata.xml 333 RMD160 28ff42d27d929095e83151b3a6bc06e9acdc1a10 SHA1 bd2334f7ff7c962f0d98678472e7feb673b942b6 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda diff --git a/sys-power/pm-utils/pm-utils-1.4.1.ebuild b/sys-power/pm-utils/pm-utils-1.4.1.ebuild index 960ecaed91be..65e7b7321187 100644 --- a/sys-power/pm-utils/pm-utils-1.4.1.ebuild +++ b/sys-power/pm-utils/pm-utils-1.4.1.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-power/pm-utils/pm-utils-1.4.1.ebuild,v 1.3 2010/07/08 07:39:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1.ebuild,v 1.4 2010/07/08 10:09:22 ssuominen Exp $ EAPI=2 inherit multilib @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon" vbetool="!video_cards_intel? ( sys-apps/vbetool )" -DEPEND="!app-laptop/laptop-mode-tools +DEPEND="!<app-laptop/laptop-mode-tools-1.55-r1 !<sys-power/powermgmt-base-1.31 !>=sys-power/powermgmt-base-1.31[-pm-utils]" RDEPEND="${DEPEND} |