1 |
commit: f7337a48971d8131bd48e34cd60c4a1a9cae3607 |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 29 10:22:13 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 29 10:22:13 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/nirbheek.git;a=commit;h=f7337a48 |
7 |
|
8 |
sys-power/upower: 0.9.8 → 0.9.11 |
9 |
|
10 |
--- |
11 |
sys-power/upower/Manifest | 6 ++-- |
12 |
.../upower-dell-samsung-sdi-battery-quirk.patch | 26 ++++----------- |
13 |
.../{upower-0.9.8.ebuild => upower-0.9.11.ebuild} | 35 +++++++++---------- |
14 |
3 files changed, 27 insertions(+), 40 deletions(-) |
15 |
|
16 |
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest |
17 |
index 2c57cf7..47a7c29 100644 |
18 |
--- a/sys-power/upower/Manifest |
19 |
+++ b/sys-power/upower/Manifest |
20 |
@@ -1,7 +1,7 @@ |
21 |
AUX upower-0.9.6-introspection-2.patch 4913 RMD160 8c564657c46ed8fb462ac897662b2f0dff085662 SHA1 4ecce4e42b977bd06d44dc81357019afbcab7359 SHA256 1bbb8272c3eb7fd377857a60804a97fa8f93c1b41ed474eaece4b30118197937 |
22 |
AUX upower-0.9.6-introspection.patch 1211 RMD160 1c5f68cd72181e7e98b43e847add7054d7372dd2 SHA1 9fbf83d4a6226e9c5eb9059ac4b907043e70c344 SHA256 4325436699554dae5cc5c3ac4768d40a44f4a708f2f4d3e90ee896c341f72dad |
23 |
AUX upower-0.9.7-linux-2.6.36.patch 871 RMD160 79aacb81bd413ac92016c6e46cc4415c5ee6b6dd SHA1 4d553a05c3e907f6da2d021d9f6c011aecff3ed9 SHA256 f3a806575c9bffde8bcd8df982c4a8cf57f204a85b40d9cb1851fe01a32911b5 |
24 |
-AUX upower-dell-samsung-sdi-battery-quirk.patch 3038 RMD160 2302b7607aec5b1758cf3baa4c1acdc7d5edfec3 SHA1 65eaddc3faaf0221b2369a8311d754c47e33b9c5 SHA256 66450976ba0ac22fc6695723526ea03822ebcf2965b4773158e109bb727fdd7d |
25 |
-DIST upower-0.9.8.tar.bz2 462754 RMD160 cf3f0ec75e4e53b3e57a6429329c19e4826844be SHA1 4eb30f974dd817e7552698483e47c2d27838fbdc SHA256 7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91 |
26 |
-EBUILD upower-0.9.8.ebuild 2190 RMD160 77070b77129e78b41ad9fb815f826cda09f09170 SHA1 26c55799bd26ef93bd23bf0652af36d97ce02703 SHA256 885a86deb70c91b45a8592728379f7346dc2649de117ee651e0baf425fb0ebe5 |
27 |
+AUX upower-dell-samsung-sdi-battery-quirk.patch 2689 RMD160 8766aafffd5a8ce8ca58c6eb7fbe03231878c963 SHA1 54a59e0ca780125518f251e41728f0fe72733f33 SHA256 160d05b1da8a67cad5807c61a7da1aa2229a29d1ccc87b5a035f8bcf4267f5e6 |
28 |
+DIST upower-0.9.11.tar.bz2 489943 RMD160 a2cd8680e10ff15aa975717e7d0456a0f9cd9193 SHA1 3906c0beaa9efc30c9930ec73dc93a961e7af734 SHA256 567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956 |
29 |
+EBUILD upower-0.9.11.ebuild 2116 RMD160 b2435bd1d61ff1753888a77d52a37ddd9e234d34 SHA1 7fc1edd0cee145847b87861f10640a45202e8011 SHA256 5b20fd1e5d583496af86b74b9553c2e6bd4f207e23934d6b2b8432a02f5214d8 |
30 |
MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093 |
31 |
|
32 |
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 |
33 |
index b0a3df1..24fb764 100644 |
34 |
--- a/sys-power/upower/files/upower-dell-samsung-sdi-battery-quirk.patch |
35 |
+++ b/sys-power/upower/files/upower-dell-samsung-sdi-battery-quirk.patch |
36 |
@@ -1,6 +1,6 @@ |
37 |
From 7849ca66af7f74bfdba968e979c4596c9e99ff3d Mon Sep 17 00:00:00 2001 |
38 |
-From: Nirbheek Chauhan <nirbheek.chauhan@×××××.com> |
39 |
-Date: Tue, 9 Nov 2010 23:54:27 +0530 |
40 |
+From: Nirbheek Chauhan <nirbheek@g.o> |
41 |
+Date: Sub, 29 May 2011 15:43:22 +0530 |
42 |
Subject: [PATCH] Add Dell laptop battery always-discharging quirk |
43 |
|
44 |
Once full, some Dell laptop batteries show battery state as "fully-charged" for |
45 |
@@ -16,34 +16,23 @@ technology: lithium-ion |
46 |
|
47 |
https://bugs.freedesktop.org/show_bug.cgi?id=31196 |
48 |
--- |
49 |
- src/linux/up-device-supply.c | 40 ++++++++++++++++++++++++++++++++++++++++ |
50 |
- 1 files changed, 40 insertions(+), 0 deletions(-) |
51 |
+ src/linux/up-device-supply.c | 37 ++++++++++++++++++++++++++++++++++++++++ |
52 |
+ 1 files changed, 37 insertions(+), 0 deletions(-) |
53 |
|
54 |
diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c |
55 |
index 341f5df..4294e04 100644 |
56 |
--- a/src/linux/up-device-supply.c |
57 |
+++ b/src/linux/up-device-supply.c |
58 |
-@@ -402,6 +402,9 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) |
59 |
+@@ -402,6 +402,8 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) |
60 |
UpDeviceState old_state; |
61 |
UpDeviceState state; |
62 |
UpDevice *device = UP_DEVICE (supply); |
63 |
+ UpDevice *device_tmp; |
64 |
+ UpDeviceKind type; |
65 |
-+ GPtrArray *devices; |
66 |
const gchar *native_path; |
67 |
GUdevDevice *native; |
68 |
gboolean is_present; |
69 |
-@@ -422,7 +425,9 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) |
70 |
- const gchar *recall_url = NULL; |
71 |
- UpDaemon *daemon; |
72 |
- gboolean on_battery; |
73 |
-+ gboolean online; |
74 |
- guint battery_count; |
75 |
-+ guint i; |
76 |
- |
77 |
- native = G_UDEV_DEVICE (up_device_get_native (device)); |
78 |
- native_path = g_udev_device_get_sysfs_path (native); |
79 |
-@@ -599,6 +604,41 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) |
80 |
+@@ -599,6 +604,40 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) |
81 |
if (percentage > 100.0f) |
82 |
percentage = 100.0f; |
83 |
} |
84 |
@@ -53,7 +42,7 @@ index 341f5df..4294e04 100644 |
85 |
+ daemon = up_device_get_daemon (device); |
86 |
+ /* get states of AC power supplies */ |
87 |
+ devices = up_device_list_get_array (up_daemon_get_device_list(daemon)); |
88 |
-+ for (i=0; i<devices->len; i++) { |
89 |
++ for (i = 0; i < devices->len; i++) { |
90 |
+ device_tmp = (UpDevice *) g_ptr_array_index (devices, i); |
91 |
+ g_object_get (device_tmp, |
92 |
+ "type", &type, |
93 |
@@ -81,7 +70,6 @@ index 341f5df..4294e04 100644 |
94 |
+ |
95 |
+ g_ptr_array_unref (devices); |
96 |
+ } |
97 |
-+ |
98 |
|
99 |
/* the battery isn't charging or discharging, it's just |
100 |
* sitting there half full doing nothing: try to guess a state */ |
101 |
|
102 |
diff --git a/sys-power/upower/upower-0.9.8.ebuild b/sys-power/upower/upower-0.9.11.ebuild |
103 |
similarity index 67% |
104 |
rename from sys-power/upower/upower-0.9.8.ebuild |
105 |
rename to sys-power/upower/upower-0.9.11.ebuild |
106 |
index 9e02ae0..bea7aae 100644 |
107 |
--- a/sys-power/upower/upower-0.9.8.ebuild |
108 |
+++ b/sys-power/upower/upower-0.9.11.ebuild |
109 |
@@ -1,9 +1,9 @@ |
110 |
# Copyright 1999-2011 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.2 2011/01/21 16:04:41 ssuominen Exp $ |
113 |
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.11.ebuild,v 1.1 2011/05/27 07:01:36 xarthisius Exp $ |
114 |
|
115 |
-EAPI=3 |
116 |
-inherit eutils linux-info |
117 |
+EAPI=4 |
118 |
+inherit linux-info |
119 |
|
120 |
DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics" |
121 |
HOMEPAGE="http://upower.freedesktop.org/" |
122 |
@@ -11,19 +11,19 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2" |
123 |
|
124 |
LICENSE="GPL-2" |
125 |
SLOT="0" |
126 |
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
127 |
-IUSE="debug doc +introspection ipod kernel_FreeBSD kernel_linux" |
128 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
129 |
+IUSE="debug doc +introspection ios kernel_FreeBSD kernel_linux" |
130 |
|
131 |
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76 |
132 |
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.88 |
133 |
>=dev-libs/glib-2.21.5:2 |
134 |
- >=sys-apps/dbus-1 |
135 |
- >=sys-auth/polkit-0.97 |
136 |
+ sys-apps/dbus |
137 |
+ >=sys-auth/polkit-0.101-r1 |
138 |
introspection? ( dev-libs/gobject-introspection ) |
139 |
kernel_linux? ( >=sys-fs/udev-151[extras] |
140 |
virtual/libusb:1 |
141 |
- ipod? ( >=app-pda/libimobiledevice-0.9.7 |
142 |
+ ios? ( >=app-pda/libimobiledevice-0.9.7 |
143 |
>=app-pda/libplist-0.12 ) ) |
144 |
- !sys-apps/devicekit-power" |
145 |
+ !sys-apps/hal" |
146 |
RDEPEND="${COMMON_DEPEND} |
147 |
kernel_linux? ( >=sys-power/pm-utils-1.4.1 )" |
148 |
DEPEND="${COMMON_DEPEND} |
149 |
@@ -36,6 +36,8 @@ DEPEND="${COMMON_DEPEND} |
150 |
|
151 |
RESTRICT="test" |
152 |
|
153 |
+DOCS=( AUTHORS HACKING NEWS README ) |
154 |
+ |
155 |
pkg_setup() { |
156 |
if use kernel_linux && kernel_is lt 2 6 37; then |
157 |
if use amd64 || use x86; then |
158 |
@@ -63,22 +65,19 @@ src_configure() { |
159 |
fi |
160 |
|
161 |
econf \ |
162 |
- --localstatedir="${EPREFIX}/var" \ |
163 |
+ --localstatedir="${EPREFIX}"/var \ |
164 |
$(use_enable introspection) \ |
165 |
- --disable-dependency-tracking \ |
166 |
--disable-static \ |
167 |
$(use_enable debug verbose-mode) \ |
168 |
--enable-man-pages \ |
169 |
$(use_enable doc gtk-doc) \ |
170 |
--disable-tests \ |
171 |
- --with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
172 |
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
173 |
--with-backend=${backend} \ |
174 |
- $(use_with ipod idevice) |
175 |
+ $(use_with ios idevice) |
176 |
} |
177 |
|
178 |
src_install() { |
179 |
- emake DESTDIR="${D}" install || die |
180 |
- dodoc AUTHORS HACKING NEWS README |
181 |
- |
182 |
- find "${ED}" -name '*.la' -exec rm -f '{}' + |
183 |
+ default |
184 |
+ find "${ED}" -name '*.la' -exec rm -f {} + |
185 |
} |