diff options
author | 2009-05-02 18:27:34 +0000 | |
---|---|---|
committer | 2009-05-02 18:27:34 +0000 | |
commit | c3399f6754d5d1ac97e3496ec5068ad1029e6a91 (patch) | |
tree | f4970b170861d7c2d0af6327308237dde5f3e280 /sys-apps/hal | |
parent | Don't install hal's policy file; bug #268243 (diff) | |
download | historical-c3399f6754d5d1ac97e3496ec5068ad1029e6a91.tar.gz historical-c3399f6754d5d1ac97e3496ec5068ad1029e6a91.tar.bz2 historical-c3399f6754d5d1ac97e3496ec5068ad1029e6a91.zip |
Block g-p-m-2.24-4-r1 and less, due to policy file conflict
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/hal')
-rw-r--r-- | sys-apps/hal/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/hal/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.5.12_rc1-r2.ebuild | 5 |
3 files changed, 12 insertions, 8 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 28e3c36b5d01..ed37e9b51369 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.281 2009/05/02 00:16:38 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.282 2009/05/02 18:27:34 dang Exp $ + + 02 May 2009; Daniel Gryniewicz <dang@gentoo.org> hal-0.5.12_rc1-r2.ebuild: + Block g-p-m-2.24-4-r1 and less, due to policy file conflict *hal-0.5.12_rc1-r2 (01 May 2009) diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 15823ef35322..af01c1d6df65 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -72,15 +72,15 @@ DIST hal-0.5.9.1-r2.tar.bz2 4246 RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b EBUILD hal-0.5.11-r4.ebuild 9500 RMD160 680791c2e323066bb90300179741133b51a54bbb SHA1 0c4d64fa18f9c9203e48660e85b57cb6c7255299 SHA256 a946413903f29c195a8f3326f07dc9ef1b8963351ff01e09368174446e33ab22 EBUILD hal-0.5.11-r8.ebuild 8905 RMD160 ba2f97b013ae5c679860da801b7edef1c3f17d8a SHA1 cffa0f28bad0b0a2fc87be4bce88c8d0ce64fe50 SHA256 4a51ca34499fb2ee6ca76855e3d8aa6a74b173e72e91a0f9937c0942f784aae1 -EBUILD hal-0.5.12_rc1-r2.ebuild 9325 RMD160 40d3bec559c1fe3f59197dc5cffae35e4dd5b691 SHA1 bac0292b608f839fbed50290e70ae30171267b57 SHA256 8665fda37eca05a5aaa84ac62c884e751d1c7da683fd7ae2a037faccd5d52a09 +EBUILD hal-0.5.12_rc1-r2.ebuild 9371 RMD160 da7da613e37840cefb58ebaf3fe98dcac960047d SHA1 8153037db4a5dba2a666575f63ac04ef186442b8 SHA256 15f50ec2883edf30f883c3c04504ea6255690a7da3731941d204f3fc345090a0 EBUILD hal-0.5.12_rc1.ebuild 8915 RMD160 e0ea0414013b4966064c237c77d7c2ec5402632f SHA1 1f47631c43cd82b21db23346739384a2e5b8c16a SHA256 bcf5f79ea719f98e31b3bec93525a8055895c328387143fa97af195dfb1f6865 EBUILD hal-0.5.9.1-r3.ebuild 6704 RMD160 86eb2621d6b9c84e8a4f42d5421819137e4f27c4 SHA1 f554bb7afb5f8a382309c3b1f876ada8fc122857 SHA256 311fee1a7d36f23cbda362459bfa04a5bdcc119518c44bfd00724461e4607f2a -MISC ChangeLog 47396 RMD160 b6b7bedd9a2db0c7e3f4b5d72443c883f80e08a3 SHA1 dcba09da909a02382c03a06ead32a15af5777a20 SHA256 2e5fce79dab94153c21fc065b66a01afb4e9995ba58acffa0a97ffa33fbe0d1d +MISC ChangeLog 47536 RMD160 c6a6cf1d6e3046bef4c984bd89ab7a4a30a250a4 SHA1 8c0ff939d24a0c04e530473b9f6514c3c19fefca SHA256 157cdac832eb6d62f962f78d0b588a14f86640b2745d8e3346168dd5b55bce13 MISC metadata.xml 2155 RMD160 1fcdfa6184292a67ea656d4f7ccb088fc6bdd1ae SHA1 9f176d6b9b599758551116a9e373f03450d861a6 SHA256 149100f02d310a485d9d543ec0bdf0848fbd079b813a6f8bb7e2f1a53790ebce -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iD8DBQFJ+5EGomPajV0RnrERAsb5AJsEyT1u+0EcdKAuuxv6wbJRZEaiOQCeIj5q -Yx2FiSw0UyIwCgaYP/n9PJc= -=EaW/ +iD8DBQFJ/JCzomPajV0RnrERAq9iAJ9IUWUgl5fO1+4sDkHztgqMjXqW8gCggJ2X +bX/Wf4VNyOB1Nh72dSIc1bI= +=V7vO -----END PGP SIGNATURE----- diff --git a/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild index f014f69ada53..e00362f02aee 100644 --- a/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild +++ b/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild,v 1.1 2009/05/02 00:16:38 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild,v 1.2 2009/05/02 18:27:34 dang Exp $ EAPI="2" @@ -58,7 +58,8 @@ DEPEND="${RDEPEND} dev-libs/libxml2 dev-util/gtk-doc app-text/docbook-sgml-utils - )" + ) + !<gnome-extra/gnome-power-manager-2.24.4-r2" PDEPEND=">=app-misc/hal-info-20081219 !gnome-extra/hal-device-manager laptop? ( >=sys-power/pm-utils-0.99.3 )" |