summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-27 21:59:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-27 21:59:50 +0000
commitbd2971b5d63887c2dbb3bd3bcac3558288a8bf2d (patch)
treefa3582fe82a82a9c0370bb5db0aab41e5318532d /sys-power/upower
parentNuke old versions (diff)
downloadgentoo-2-bd2971b5d63887c2dbb3bd3bcac3558288a8bf2d.tar.gz
gentoo-2-bd2971b5d63887c2dbb3bd3bcac3558288a8bf2d.tar.bz2
gentoo-2-bd2971b5d63887c2dbb3bd3bcac3558288a8bf2d.zip
revert blocker for stable tree, for solid users
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'sys-power/upower')
-rw-r--r--sys-power/upower/ChangeLog5
-rw-r--r--sys-power/upower/upower-0.9.8.ebuild5
2 files changed, 4 insertions, 6 deletions
diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 570fd6a151fe..44effb613920 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,14 +1,13 @@
# 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.39 2011/03/27 15:52:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.40 2011/03/27 21:59:50 ssuominen Exp $
27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild,
upower-0.9.9.ebuild:
Rename USE="ipod" to USE="ios" because this package is using libimobiledevice
instead of libgpod wrt #344763.
- 27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild,
- upower-0.9.9.ebuild:
+ 27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> 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 63067f10c0bd..b2b11fc35f3e 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.10 2011/03/27 15:52:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.11 2011/03/27 21:59:50 ssuominen Exp $
EAPI=3
inherit linux-info
@@ -23,8 +23,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
virtual/libusb:1
ios? ( >=app-pda/libimobiledevice-0.9.7
>=app-pda/libplist-0.12 ) )
- !sys-apps/devicekit-power
- !sys-apps/hal"
+ !sys-apps/devicekit-power"
RDEPEND="${COMMON_DEPEND}
kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
DEPEND="${COMMON_DEPEND}