diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 08:21:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 08:21:49 +0000 |
| commit | c52d70edd798e6ab82c201ffc19553b241e9ecdc (patch) | |
| tree | 729d44a9a085521a14e42448690eb7057cc84a6a /sys-power | |
| parent | Block sys-apps/hal to prevent overlapping. (diff) | |
| download | gentoo-2-c52d70edd798e6ab82c201ffc19553b241e9ecdc.tar.gz gentoo-2-c52d70edd798e6ab82c201ffc19553b241e9ecdc.tar.bz2 gentoo-2-c52d70edd798e6ab82c201ffc19553b241e9ecdc.zip | |
Block sys-apps/hal to prevent overlapping.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/upower/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.9.8.ebuild | 5 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.9.9.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog index dc90c77c8978..32f2f59152b2 100644 --- a/sys-power/upower/ChangeLog +++ b/sys-power/upower/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/upower # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.37 2011/03/26 11:40:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.38 2011/03/27 08:21:48 ssuominen Exp $ + + 27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild, + upower-0.9.9.ebuild: + Block sys-apps/hal to prevent overlapping. *upower-0.9.9 (26 Mar 2011) diff --git a/sys-power/upower/upower-0.9.8.ebuild b/sys-power/upower/upower-0.9.8.ebuild index c0b3d30dbf7b..ab359634ddd2 100644 --- a/sys-power/upower/upower-0.9.8.ebuild +++ b/sys-power/upower/upower-0.9.8.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-power/upower/upower-0.9.8.ebuild,v 1.8 2011/03/22 21:21:08 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.9 2011/03/27 08:21:49 ssuominen Exp $ EAPI=3 inherit linux-info @@ -23,7 +23,8 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76 virtual/libusb:1 ipod? ( >=app-pda/libimobiledevice-0.9.7 >=app-pda/libplist-0.12 ) ) - !sys-apps/devicekit-power" + !sys-apps/devicekit-power + !sys-apps/hal" RDEPEND="${COMMON_DEPEND} kernel_linux? ( >=sys-power/pm-utils-1.4.1 )" DEPEND="${COMMON_DEPEND} diff --git a/sys-power/upower/upower-0.9.9.ebuild b/sys-power/upower/upower-0.9.9.ebuild index e3d60eb0a0e7..94413561a020 100644 --- a/sys-power/upower/upower-0.9.9.ebuild +++ b/sys-power/upower/upower-0.9.9.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-power/upower/upower-0.9.9.ebuild,v 1.1 2011/03/26 11:40:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.9.ebuild,v 1.2 2011/03/27 08:21:48 ssuominen Exp $ EAPI=3 inherit linux-info @@ -23,7 +23,8 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.88 virtual/libusb:1 ipod? ( >=app-pda/libimobiledevice-0.9.7 >=app-pda/libplist-0.12 ) ) - !sys-apps/devicekit-power" + !sys-apps/devicekit-power + !sys-apps/hal" RDEPEND="${COMMON_DEPEND} kernel_linux? ( >=sys-power/pm-utils-1.4.1 )" DEPEND="${COMMON_DEPEND} |