summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-power/upower/Manifest6
-rw-r--r--sys-power/upower/files/upower-dell-samsung-sdi-battery-quirk.patch26
-rw-r--r--sys-power/upower/upower-0.9.11.ebuild (renamed from sys-power/upower/upower-0.9.8.ebuild)35
3 files changed, 27 insertions, 40 deletions
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 2c57cf7..47a7c29 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,7 @@
AUX upower-0.9.6-introspection-2.patch 4913 RMD160 8c564657c46ed8fb462ac897662b2f0dff085662 SHA1 4ecce4e42b977bd06d44dc81357019afbcab7359 SHA256 1bbb8272c3eb7fd377857a60804a97fa8f93c1b41ed474eaece4b30118197937
AUX upower-0.9.6-introspection.patch 1211 RMD160 1c5f68cd72181e7e98b43e847add7054d7372dd2 SHA1 9fbf83d4a6226e9c5eb9059ac4b907043e70c344 SHA256 4325436699554dae5cc5c3ac4768d40a44f4a708f2f4d3e90ee896c341f72dad
AUX upower-0.9.7-linux-2.6.36.patch 871 RMD160 79aacb81bd413ac92016c6e46cc4415c5ee6b6dd SHA1 4d553a05c3e907f6da2d021d9f6c011aecff3ed9 SHA256 f3a806575c9bffde8bcd8df982c4a8cf57f204a85b40d9cb1851fe01a32911b5
-AUX upower-dell-samsung-sdi-battery-quirk.patch 3038 RMD160 2302b7607aec5b1758cf3baa4c1acdc7d5edfec3 SHA1 65eaddc3faaf0221b2369a8311d754c47e33b9c5 SHA256 66450976ba0ac22fc6695723526ea03822ebcf2965b4773158e109bb727fdd7d
-DIST upower-0.9.8.tar.bz2 462754 RMD160 cf3f0ec75e4e53b3e57a6429329c19e4826844be SHA1 4eb30f974dd817e7552698483e47c2d27838fbdc SHA256 7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91
-EBUILD upower-0.9.8.ebuild 2190 RMD160 77070b77129e78b41ad9fb815f826cda09f09170 SHA1 26c55799bd26ef93bd23bf0652af36d97ce02703 SHA256 885a86deb70c91b45a8592728379f7346dc2649de117ee651e0baf425fb0ebe5
+AUX upower-dell-samsung-sdi-battery-quirk.patch 2689 RMD160 8766aafffd5a8ce8ca58c6eb7fbe03231878c963 SHA1 54a59e0ca780125518f251e41728f0fe72733f33 SHA256 160d05b1da8a67cad5807c61a7da1aa2229a29d1ccc87b5a035f8bcf4267f5e6
+DIST upower-0.9.11.tar.bz2 489943 RMD160 a2cd8680e10ff15aa975717e7d0456a0f9cd9193 SHA1 3906c0beaa9efc30c9930ec73dc93a961e7af734 SHA256 567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956
+EBUILD upower-0.9.11.ebuild 2116 RMD160 b2435bd1d61ff1753888a77d52a37ddd9e234d34 SHA1 7fc1edd0cee145847b87861f10640a45202e8011 SHA256 5b20fd1e5d583496af86b74b9553c2e6bd4f207e23934d6b2b8432a02f5214d8
MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/files/upower-dell-samsung-sdi-battery-quirk.patch b/sys-power/upower/files/upower-dell-samsung-sdi-battery-quirk.patch
index b0a3df1..24fb764 100644
--- a/sys-power/upower/files/upower-dell-samsung-sdi-battery-quirk.patch
+++ b/sys-power/upower/files/upower-dell-samsung-sdi-battery-quirk.patch
@@ -1,6 +1,6 @@
From 7849ca66af7f74bfdba968e979c4596c9e99ff3d Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
-Date: Tue, 9 Nov 2010 23:54:27 +0530
+From: Nirbheek Chauhan <nirbheek@gentoo.org>
+Date: Sub, 29 May 2011 15:43:22 +0530
Subject: [PATCH] Add Dell laptop battery always-discharging quirk
Once full, some Dell laptop batteries show battery state as "fully-charged" for
@@ -16,34 +16,23 @@ technology: lithium-ion
https://bugs.freedesktop.org/show_bug.cgi?id=31196
---
- src/linux/up-device-supply.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 40 insertions(+), 0 deletions(-)
+ src/linux/up-device-supply.c | 37 ++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
index 341f5df..4294e04 100644
--- a/src/linux/up-device-supply.c
+++ b/src/linux/up-device-supply.c
-@@ -402,6 +402,9 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
+@@ -402,6 +402,8 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
UpDeviceState old_state;
UpDeviceState state;
UpDevice *device = UP_DEVICE (supply);
+ UpDevice *device_tmp;
+ UpDeviceKind type;
-+ GPtrArray *devices;
const gchar *native_path;
GUdevDevice *native;
gboolean is_present;
-@@ -422,7 +425,9 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
- const gchar *recall_url = NULL;
- UpDaemon *daemon;
- gboolean on_battery;
-+ gboolean online;
- guint battery_count;
-+ guint i;
-
- native = G_UDEV_DEVICE (up_device_get_native (device));
- native_path = g_udev_device_get_sysfs_path (native);
-@@ -599,6 +604,41 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
+@@ -599,6 +604,40 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
if (percentage > 100.0f)
percentage = 100.0f;
}
@@ -53,7 +42,7 @@ index 341f5df..4294e04 100644
+ daemon = up_device_get_daemon (device);
+ /* get states of AC power supplies */
+ devices = up_device_list_get_array (up_daemon_get_device_list(daemon));
-+ for (i=0; i<devices->len; i++) {
++ for (i = 0; i < devices->len; i++) {
+ device_tmp = (UpDevice *) g_ptr_array_index (devices, i);
+ g_object_get (device_tmp,
+ "type", &type,
@@ -81,7 +70,6 @@ index 341f5df..4294e04 100644
+
+ g_ptr_array_unref (devices);
+ }
-+
/* the battery isn't charging or discharging, it's just
* sitting there half full doing nothing: try to guess a state */
diff --git a/sys-power/upower/upower-0.9.8.ebuild b/sys-power/upower/upower-0.9.11.ebuild
index 9e02ae0..bea7aae 100644
--- a/sys-power/upower/upower-0.9.8.ebuild
+++ b/sys-power/upower/upower-0.9.11.ebuild
@@ -1,9 +1,9 @@
# 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.2 2011/01/21 16:04:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.11.ebuild,v 1.1 2011/05/27 07:01:36 xarthisius Exp $
-EAPI=3
-inherit eutils linux-info
+EAPI=4
+inherit linux-info
DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
HOMEPAGE="http://upower.freedesktop.org/"
@@ -11,19 +11,19 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug doc +introspection ipod kernel_FreeBSD kernel_linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc +introspection ios kernel_FreeBSD kernel_linux"
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.88
>=dev-libs/glib-2.21.5:2
- >=sys-apps/dbus-1
- >=sys-auth/polkit-0.97
+ sys-apps/dbus
+ >=sys-auth/polkit-0.101-r1
introspection? ( dev-libs/gobject-introspection )
kernel_linux? ( >=sys-fs/udev-151[extras]
virtual/libusb:1
- ipod? ( >=app-pda/libimobiledevice-0.9.7
+ ios? ( >=app-pda/libimobiledevice-0.9.7
>=app-pda/libplist-0.12 ) )
- !sys-apps/devicekit-power"
+ !sys-apps/hal"
RDEPEND="${COMMON_DEPEND}
kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
DEPEND="${COMMON_DEPEND}
@@ -36,6 +36,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="test"
+DOCS=( AUTHORS HACKING NEWS README )
+
pkg_setup() {
if use kernel_linux && kernel_is lt 2 6 37; then
if use amd64 || use x86; then
@@ -63,22 +65,19 @@ src_configure() {
fi
econf \
- --localstatedir="${EPREFIX}/var" \
+ --localstatedir="${EPREFIX}"/var \
$(use_enable introspection) \
- --disable-dependency-tracking \
--disable-static \
$(use_enable debug verbose-mode) \
--enable-man-pages \
$(use_enable doc gtk-doc) \
--disable-tests \
- --with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
--with-backend=${backend} \
- $(use_with ipod idevice)
+ $(use_with ios idevice)
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS HACKING NEWS README
-
- find "${ED}" -name '*.la' -exec rm -f '{}' +
+ default
+ find "${ED}" -name '*.la' -exec rm -f {} +
}