diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 08:44:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 08:44:23 +0000 |
| commit | 64516c0d9c6a07a90b8662374c1cb7a2a5c55cf9 (patch) | |
| tree | f14e71f97bc14e71b2822d75c7a5988db10c2333 /sys-apps/hal | |
| parent | Stable on x86 (#350853) (diff) | |
| download | historical-64516c0d9c6a07a90b8662374c1cb7a2a5c55cf9.tar.gz historical-64516c0d9c6a07a90b8662374c1cb7a2a5c55cf9.tar.bz2 historical-64516c0d9c6a07a90b8662374c1cb7a2a5c55cf9.zip | |
Block both sys-fs/udisks and sys-power/upower to prevent overlapping.
Package-Manager: portage-2.2.0_alpha28/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 | 4 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.5.14-r4.ebuild | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 7cd03db54335..f0c476b80813 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.333 2011/03/21 19:51:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.334 2011/03/27 08:44:23 ssuominen Exp $ + + 27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> hal-0.5.14-r4.ebuild: + Block both sys-fs/udisks and sys-power/upower to prevent overlapping. 21 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> hal-0.5.14-r4.ebuild: Commit 0011-hal-0.5.14-no-more-videodev_h.patch to patchset (fixing build diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 1406cfbb4e0b..2e79f2cd1ff5 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -3,6 +3,6 @@ AUX 0.5.14-hald.rc.1 1114 RMD160 24c508a1a8df09252a21b178addba8a18a17ba1e SHA1 6 AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 31169a28448fb1eb1dfee5d1699de9a02449a6b7 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b DIST hal-0.5.14-gentoo-patches-5.tar.bz2 6494 RMD160 810e68c430b9207ddc6d7531a728cc3f49eea7b4 SHA1 0b5159d6cbd91c9357f1c5b59074fd48870d6156 SHA256 5919bf1e3e5ff8b3682b8163e8b9cd86269263f9d023783d0c13dc759b36849c DIST hal-0.5.14.tar.bz2 942954 RMD160 0314dace9512bf49a62bd1556963fc60a6c9caf9 SHA1 a6ec098d78112e18e2773afa5f9ed642b00c4c59 SHA256 c4c5ecc5d50d5d9c061dc06c405461b1f71c12f2c60ed062350b2e6db2f1c51e -EBUILD hal-0.5.14-r4.ebuild 9209 RMD160 38e5299c4bf9f3839ab3b6b2727968cdb25ddf99 SHA1 4e3072f2c8df663af848bac6a1f91e5ff70a7e15 SHA256 847f17a981ee2ef6b664c807c9a464f6410f114b9ec913cd121cfbc08c87caf5 -MISC ChangeLog 58346 RMD160 e26fc912eca43f4ebd67b3df64b73c3c05fed88c SHA1 51c2752c336f1acc76091aa6e561a0ded2089817 SHA256 486edcbb62723ca0439b6a00c74b94ab669ca0132da79e72a986a61051eb263e +EBUILD hal-0.5.14-r4.ebuild 9248 RMD160 96ec0fbf2aee05d43e134b62b6b8ec816347a088 SHA1 5d2ae4f7ddc4d44db15677dce92939086c98cc02 SHA256 da7b56ea00d8259cecf87163fd4b38bef2380210c9ffa3ff433caa4cbdf07a60 +MISC ChangeLog 58495 RMD160 bb319b7cdf4b9bf67a9fc6a9206121565c513e77 SHA1 9132be625d0ad97caeeaf4628ed5ff7683b367a4 SHA256 3911c06170076364b961112daef7922e6fec9016d1c0035a319526ee67b18b3c MISC metadata.xml 1843 RMD160 bc111bdf8044d6059a71a2c5d966312f2eefac89 SHA1 048fcfcea2fa8480dec47e3b748e444196bc55a4 SHA256 c93c7a9617caeec7d8a54d9c11047d095c52442df28844cfb57452bf44ba25f1 diff --git a/sys-apps/hal/hal-0.5.14-r4.ebuild b/sys-apps/hal/hal-0.5.14-r4.ebuild index 78f953de8f59..7d4151e13c51 100644 --- a/sys-apps/hal/hal-0.5.14-r4.ebuild +++ b/sys-apps/hal/hal-0.5.14-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.14-r4.ebuild,v 1.5 2011/03/21 19:51:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.14-r4.ebuild,v 1.6 2011/03/27 08:44:23 ssuominen Exp $ EAPI="2" @@ -42,7 +42,9 @@ RDEPEND=">=dev-libs/dbus-glib-0.61 ) kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) x86? ( >=sys-apps/dmidecode-2.7 ) - selinux? ( sys-libs/libselinux sec-policy/selinux-hal )" + selinux? ( sys-libs/libselinux sec-policy/selinux-hal ) + !sys-fs/udisks + !sys-power/upower" DEPEND="${RDEPEND} dev-util/pkgconfig >=dev-util/gperf-3.0.3 |