Version bump, gtk-doc files need to be built and were installed in unproper location

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

8 files changed, 38 insertions, 280 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index b1067566d11a..f631780e7e7f 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.179 2015/07/03 10:10:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.180 2015/07/04 17:14:47 pacho Exp $
+
+*upower-0.99.3 (04 Jul 2015)
+
+  04 Jul 2015; Pacho Ramos <pacho@gentoo.org> +upower-0.99.3.ebuild,
+  -files/upower-0.99.0-create-dir-runtime.patch,
+  -files/upower-0.99.0-fix-segfault.patch,
+  -files/upower-0.99.0-fix-shutdown-on-boot.patch,
+  -files/upower-0.99.0-fix-typing-error.patch, -upower-0.99.0-r1.ebuild,
+  -upower-0.99.2.ebuild:
+  Version bump, gtk-doc files need to be built and were installed in unproper
+  location
 
   03 Jul 2015; Agostino Sarubbo <ago@gentoo.org> upower-0.99.2-r1.ebuild:
   Stable for alpha, wrt bug #537878
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 72b80c016b8a..01ca74d76155 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,33 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX upower-0.99.0-create-dir-runtime.patch 1164 SHA256 6324c148d436e3f898b73b445411f29a7527c65ffedb574ef658c1eaaa1aa4de SHA512 1aaec53df73aa50fabffaddd380800f7ed78caddc02b16834831aa1faa09c795e0def04493f64d852a9b07b9ef4007352e111c5d7cdc1f1b2ed8043c445751f2 WHIRLPOOL 4347f169597c8e144081673d038809a4f0525410aef7e3ff3b713f22dd28e1d7f4bcc69413be2d3c87e7e228dc8da6cfab7b6a3e63feeafafb6e8dc5d4d3a018
-AUX upower-0.99.0-fix-segfault.patch 829 SHA256 c80d1510b3e3d0579ddbec328d2800ab7e112378f9a8ff9ef152d72de50a45c3 SHA512 31a6b5414ddd17cbbcf318da98907d745910e7632ea9a4d4d5c02eaaae87857b5bb88f9ab2f336f7b24637727005fb839f8c9564b82e56ae0065d57b1ce19ad2 WHIRLPOOL 4286fadfbb45b89891ca4aed49b11cde70afa357101f4b9b150d9f68e548af28436fa25a9d8143f7d90daaff0ee22238dd017f10e1e34e58a226553a84724682
-AUX upower-0.99.0-fix-shutdown-on-boot.patch 2583 SHA256 5af2d8aa09f64988eade79ac30d20236076a00b4878c77c6fbca5eefa78e21c6 SHA512 b422bc4bc4258532d817fad250c50101886cd4542c42c4617ddd846db9a908ac8da8a8e977a9ea6d20421db768097735a13bcc1c3282df6cc1da88390ffc3ecd WHIRLPOOL 29ac060035968328263b59139260c21e52a5a4620bb784fb437ee27ac04a91a9a94344dc700a21b1a08150ed727c2aa9c5365d2db72d6e6febc540f551b46dc5
-AUX upower-0.99.0-fix-typing-error.patch 711 SHA256 9eca510c8d9e8daba99815dfc1fe853270e55d22ab9657d6f458ec492b9a880b SHA512 b40bef2c98af8ae0fe571fb8f9be43602b0309db68fedafaefaf22682d344c640c5d7e6a173a5bc889e5fe8d6a647cbc07b767ef1adc0570ee45d03d94a52370 WHIRLPOOL cca6101b3d9abca0f3085f49fc5c91a862f1c1b29966d0a168a257a15a67b7c8d54df27501118b476a77d3c1742962fc2053d007ea3a66572721a6e027669de8
-DIST upower-0.99.0.tar.xz 429076 SHA256 5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1 SHA512 efb9544730a1baa8abdc5af4b5320ec1fa7518bdaa9e56129eef4aa4caf8167c7bf72f7bc0e71ca7b6d127a1464462667b86039a4c5248c8c75c66334e038ea7 WHIRLPOOL 15634811ae267a9811933c75af25321e885d9646782c21cac237d20bea4a673930af3bf9a1873d5295e31676714c64ef6fb187c780b903e872e4e6677b615e20
 DIST upower-0.99.1.tar.xz 428072 SHA256 8c4de2101958ef2a0522e1bd1893caf9678cd3de45410e246fce2b4635315600 SHA512 3a413234226a957e8dcb60a1b8a73a4d1b9eb34705b01b404580a34c2a9e61a30b20e8ccefe72dc3457ea305beb910fc02ce76469982c95cbf0ed6bc785b7783 WHIRLPOOL d526c9a23e225287738c19c5f8cd0ab2fc07e780d4f1bf5014da2d026c22af3801b500d0f8898a901fbfbbf8b5e93a90392531f66747c07280393a7e61370b66
 DIST upower-0.99.2.tar.xz 428668 SHA256 e9dc453adf96b89c92ccccd33f2b6543258344f7c8ba89460dc0a92a8180946f SHA512 a7859c91078140f460556ecf998a706b403d5ed2ff073fffa93730c95e62a8ec00b91f6669d74afd8d0ada73d75b27320d52a3589765712dc078f78a28ea527b WHIRLPOOL 42abf07947bcd1709045d3a0c945161b98a422e90c31ebda7a69783ee8915ecd9d048713412b3f1e26d4db96f85a4bf6e1d63b310f9fc5aa20519bb2e3c51f32
-EBUILD upower-0.99.0-r1.ebuild 2178 SHA256 014379d9e3c5bd415147e37371629ae0f18392b7ed1b16d3b5bcbeb543e42d40 SHA512 221eb19ae394c3ef27bf53895bd97dade15ccfe15076eaac72486b2a6db849b555ff3ec7ac61a71fe97e0b13f61bdcf241cb3f067062bbf353384887bf26492f WHIRLPOOL 170628c391ac3e9926d86e5e9f667067df588e1481eecb97a5c5dc6288b612c70797d7ebef52899410945f0f2b2a54635a40eeed88c7edef081db2ef73e7394d
+DIST upower-0.99.3.tar.xz 429252 SHA256 697199bcc113bb069e6fb6bf4135536a702ba9847e46c5fc6df87d19624ddd38 SHA512 665b5b03605910b3a2d3f32e4846c2b2ab4c91ba91c55dde8c5b8ab3856f3d6fea5efac20fdb608050b57979ed344ef630c76acc0b3f858e8c5168f6adeb2d64 WHIRLPOOL c6543518d64c1628763695a10f81d6ae9b48f252c7a7ee68deb1249489329414101a620c1f529c8f76e460713faeb0077c75489466c6aeb54008590b49441181
 EBUILD upower-0.99.1.ebuild 1959 SHA256 03f9a50fc952f2c701252922bd60d0e808bd0e3201bd291a11036e0a89112015 SHA512 b09769ea5a69924580fafb40f3dd1597599de3c7b408667b6794ef6609a48ecd62bf229ba485c931a2a734575e7986f71c5ca222bad556e19d015a71f541a2b8 WHIRLPOOL beb9a9663081c671a6fd6119e3dd9e97849c65761706ad923c76370e2d63e6442ef95ea7244498202bcb88531e9959323f6c3cd4de5570f34fede504089eb75b
 EBUILD upower-0.99.2-r1.ebuild 2046 SHA256 7ca04f585e0ae554ae8d39040ac45df4ff34dc96bbcbbd7aaf80e82084942285 SHA512 3557343914b43a528f73806197693ccae00b61c03a9803261fc72b876f8ff8a63ec10c066d715c712c9f5c59c045a9bc4308a8e9af9a4163317df5c9b79ac800 WHIRLPOOL b53fa5ce4eedfc4c340a83b912c188a5ec53b080468065512371d072ebcf84f09209b0fb0c5071add3a114217451f0680151f17c1209f3ba305d602a0ceb595a
-EBUILD upower-0.99.2.ebuild 1971 SHA256 b9a2ca111fd03b4dfcfa2753f0e973896a647d177364afb350b742a66047b562 SHA512 3a23e8bb9131b5e1778b5e810f5ccc4dc2de4e114f5f2b5390d877c7b1ed67e304e8ace64a971b8a4d01f6e68ba4ad45036ab44ee7370a98707d8cfaff9d467c WHIRLPOOL 5129e16a421966b6380132f5cb5cc1f3318acf54b7b57310794439bfa7db9e02d42320c271ee3aec0267c1167d9c2dd8c8ffa7babe603506f2f421cb2733bf92
-MISC ChangeLog 23648 SHA256 2cf60227bda2ea420c3a65cb703b9ce5984889ee237a62342390dc02d8fecb2d SHA512 f64ed9e06296dbc43ddfedd04bdcf5cb920c42e1bd12a6ca1b1b5914cb04630b02a020d5ac8c2014864d4039d8af37b87b3dd8c89f32836ef37839e0e079002b WHIRLPOOL d201ac7bd33237bb4916db7c82d23ca2fed04a4940297e56617534edf7ba2c7ce82ba441530eeba4587942bbc07c1bd3913738966d5ad152b3d997055081ea64
+EBUILD upower-0.99.3.ebuild 1959 SHA256 7ee11e8c5c1bcbe64576e4174f3bb5488d6b8b8afb79355e10127694ebb69784 SHA512 9caaf63ba675a8f04583295dc2b769b083230bec263f818f64ae1179cd880b4a8a1ef18378a242edf93362e950e72afd0eeaf9da74dca2dd2fe0b86d5fa11f45 WHIRLPOOL 8a903e1aad4857ef93a2c35a21c24d54469d54d8621402b783fb1b4e29f240949041749334ce2d12c881f25bcebd133524941205d19d00f599f52575865be9e7
+MISC ChangeLog 24080 SHA256 8348fb770563de903bfb8edc2ccaa861c6736cadebacc8175ad2db72bf0e032d SHA512 ab7b6cd8fd2a5c1295682f034e956b71f5ae1ae89bedc7e1c2b77ef31a58741d0b7fbf76f20496df2edef3576e9675fbdc5c14cb71bd64a2fb48121667a7059d WHIRLPOOL 6bf1eb6d55c7f0234360ce58b62c625b157af536bdfe319568c4e8b90abb43732c2b77f30878ae9eaf6baab11e214fc7d15f5cc4109d1bad2ce1b7fe7f9ea59b
 MISC metadata.xml 239 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8 SHA512 ab6b74388bf69a67b0d1f4283475f97eb5a731f31b5c9db4ee50b819a846c77d4ef09f63856e31a68b0bfdf18ee3baa6c76720d4345ccadf154385caaf1033bb WHIRLPOOL bcac6415c046557e53bf04579e077fed4d694dee8f7c0faeecf15f3f036137a2c9f0eaa0c492cecef23a45bd5af2c45542acd26641209d3c9be3108bf1ff09a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVll95AAoJELp701BxlEWfQSsP/2b4brUVMxVsDBAHnlhumI3+
-8vPJqFS1YE1PnzliRssLaT4OapKz7tsK/XKq2PURaGkVsLl7KB9CXUfoYF6C2NjB
-UteHX1DrQKgjQZiOiu8Rvuc3QexxYNa2Prc4/mz0+ys6P+IMtCow+AUu2UeVhDgQ
-6DcPvKVTSBpkppmi+huuC/E333ZXmrXbgjpq6H13Hb4fyHPwj1cv39Ft42uDZRio
-XEBd3ebjMg/fblHg4onKo1Rd4r5ZPdP5mZ5JuM7F7vZ7kfLhVv0i2Em5fhFrnFpY
-cexEh77QBNAOZwajU6DVpm03qgPJXm3nEBUglVH66w6KaBfR31OWU+3HXs6APJn9
-xfP5MCrjuzTgs3T7njhMUfTK3la4pF6thURMSBNAiSZVraQIyGCI1ssY0tNmfJ1j
-B/id2mBE5+emQybt2OkBeHv0a1Q43QzoiK5q4RkJ8sEQGfpfysh0tdI4B69nUSN7
-+oyFobfXcy/IkZUgOeWxPtOSQZaPys5bFoDmGkCqQPfsbVqLes2hMr9oXXmzJ9hC
-/3tHizUgrWExWzjnez9xZRui2K3m4em1+Y75rkVSDo858xbeVuVIYaY+tSYaRLef
-dd6fH6/x55cyE615xJoSR4DySLBcz/G0j22M4jmOWd9cGua3uxbGAdvaUEUZcc5X
-IWIrDFNeawGdnT5EW/EJ
-=S6W5
+iEYEAREIAAYFAlWYFIkACgkQCaWpQKGI+9TdowCfTm9bkXbEk6y7rUTHH1BYFlku
+I6MAnA39oia6tUlChFPllt7NXFNKyP9E
+=Gvky
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower/files/upower-0.99.0-create-dir-runtime.patch b/sys-power/upower/files/upower-0.99.0-create-dir-runtime.patch
deleted file mode 100644
index 34340d44ec30..000000000000
--- a/sys-power/upower/files/upower-0.99.0-create-dir-runtime.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b9cff29978113aefe3ad18521f383f12ab099a34 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimo@endlessm.com>
-Date: Tue, 25 Feb 2014 09:43:04 +0000
-Subject: Create the history directory at runtime
-
-In addition to build time - this increases compatibilty with OSTree,
-which starts out with an empty /var.
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
-diff --git a/src/up-history.c b/src/up-history.c
-index f9d0fdf..795b093 100644
---- a/src/up-history.c
-+++ b/src/up-history.c
-@@ -414,6 +414,7 @@ up_history_set_directory (UpHistory *history, const gchar *dir)
- {
- 	g_free (history->priv->dir);
- 	history->priv->dir = g_strdup (dir);
-+	g_mkdir_with_parents (dir, 0755);
- }
- 
- /**
-@@ -887,7 +888,8 @@ up_history_init (UpHistory *history)
- 	history->priv->data_time_full = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
- 	history->priv->data_time_empty = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
- 	history->priv->max_data_age = UP_HISTORY_DEFAULT_MAX_DATA_AGE;
--	history->priv->dir = g_build_filename (HISTORY_DIR, NULL);
-+
-+	up_history_set_directory (history, HISTORY_DIR);
- }
- 
- /**
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower/files/upower-0.99.0-fix-segfault.patch b/sys-power/upower/files/upower-0.99.0-fix-segfault.patch
deleted file mode 100644
index 3e8976320777..000000000000
--- a/sys-power/upower/files/upower-0.99.0-fix-segfault.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Fri, 08 Nov 2013 13:59:50 +0000
-Subject: lib: Fix segfault on getting property when daemon is not running
-
-This fixes "upower --version" when the daemon is not running, and thus the
-client proxy is NULL.
----
-diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
-index 35d7b5d..17fb02d 100644
---- a/libupower-glib/up-client.c
-+++ b/libupower-glib/up-client.c
-@@ -322,6 +322,9 @@ up_client_get_property (GObject *object,
- 	UpClient *client;
- 	client = UP_CLIENT (object);
- 
-+	if (client->priv->proxy == NULL)
-+                return;
-+
- 	switch (prop_id) {
- 	case PROP_DAEMON_VERSION:
- 		g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy));
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower/files/upower-0.99.0-fix-shutdown-on-boot.patch b/sys-power/upower/files/upower-0.99.0-fix-shutdown-on-boot.patch
deleted file mode 100644
index 76fdcc876a2b..000000000000
--- a/sys-power/upower/files/upower-0.99.0-fix-shutdown-on-boot.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From dbf7eb7e557674a9b888a088f1cae4f36b77e14d Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 23 Apr 2014 13:34:24 +0000
-Subject: daemon: Fix shutdown on boot on some machines
-
-On the Lenovo A600 all-in-one, there's a HCI/HID dual-mode Broadcom
-device which will try to get the battery level of the supplied
-mouse and keyboard, but will usually fail to do so.
-
-So we have a battery of type "battery" (it's not either a mouse or
-a keyboard, as it's supposed to handle both) but our display device
-battery code doesn't check whether those batteries are power supplies
-or not, using this "empty" (0% after the check timed out) battery in
-the shutdown policy.
-
-Check better for power supply devices, not all the "battery" types
-are power supply batteries, they might be non-power supply ones
-from unknown device types.
----
-diff --git a/src/up-daemon.c b/src/up-daemon.c
-index df0a7b7..ef90be4 100644
---- a/src/up-daemon.c
-+++ b/src/up-daemon.c
-@@ -208,6 +208,7 @@ up_daemon_update_display_battery (UpDaemon *daemon)
- 		gdouble energy_rate = 0.0;
- 		gint64 time_to_empty = 0;
- 		gint64 time_to_full = 0;
-+		gboolean power_supply = FALSE;
- 
- 		device = g_ptr_array_index (array, i);
- 		g_object_get (device,
-@@ -219,6 +220,7 @@ up_daemon_update_display_battery (UpDaemon *daemon)
- 			      "energy-rate", &energy_rate,
- 			      "time-to-empty", &time_to_empty,
- 			      "time-to-full", &time_to_full,
-+			      "power-supply", &power_supply,
- 			      NULL);
- 
- 		/* When we have a UPS, it's either a desktop, and
-@@ -236,7 +238,8 @@ up_daemon_update_display_battery (UpDaemon *daemon)
- 			is_present_total = TRUE;
- 			break;
- 		}
--		if (kind != UP_DEVICE_KIND_BATTERY)
-+		if (kind != UP_DEVICE_KIND_BATTERY ||
-+		    power_supply == FALSE)
- 			continue;
- 
- 		/* If one battery is charging, then the composite is charging
-@@ -389,17 +392,21 @@ up_daemon_refresh_battery_devices (UpDaemon *daemon)
- 	guint i;
- 	GPtrArray *array;
- 	UpDevice *device;
--	UpDeviceKind type;
- 
- 	/* refresh all devices in array */
- 	array = up_device_list_get_array (daemon->priv->power_devices);
- 	for (i=0; i<array->len; i++) {
-+		UpDeviceKind type;
-+		gboolean power_supply;
-+
- 		device = (UpDevice *) g_ptr_array_index (array, i);
- 		/* only refresh battery devices */
- 		g_object_get (device,
- 			      "type", &type,
-+			      "power-supply", &power_supply,
- 			      NULL);
--		if (type == UP_DEVICE_KIND_BATTERY)
-+		if (type == UP_DEVICE_KIND_BATTERY &&
-+		    power_supply)
- 			up_device_refresh_internal (device);
- 	}
- 	g_ptr_array_unref (array);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower/files/upower-0.99.0-fix-typing-error.patch b/sys-power/upower/files/upower-0.99.0-fix-typing-error.patch
deleted file mode 100644
index d972e96a0511..000000000000
--- a/sys-power/upower/files/upower-0.99.0-fix-typing-error.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d650df8af80b734f6c44a0acb2080493330b8836 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 23 Apr 2014 13:20:37 +0000
-Subject: lib: Fix typo in g-i annotation
-
-Missing colon.
----
-diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
-index 17fb02d..582fac9 100644
---- a/libupower-glib/up-client.c
-+++ b/libupower-glib/up-client.c
-@@ -131,7 +131,7 @@ up_client_get_devices (UpClient *client)
-  * @client: a #UpClient instance.
-  *
-  * Get the composite display device.
-- * Return value: (transfer full) a #UpClient object, or %NULL on error.
-+ * Return value: (transfer full): a #UpClient object, or %NULL on error.
-  *
-  * Since: 1.0
-  **/
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower/upower-0.99.0-r1.ebuild b/sys-power/upower/upower-0.99.0-r1.ebuild
deleted file mode 100644
index 16f9e09a0afd..000000000000
--- a/sys-power/upower/upower-0.99.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.99.0-r1.ebuild,v 1.7 2014/09/15 08:24:22 ago Exp $
-
-EAPI=5
-inherit eutils systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://upower.freedesktop.org/"
-SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/2" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+introspection ios kernel_FreeBSD kernel_linux"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	sys-apps/dbus:=
-	>=sys-auth/polkit-0.110
-	introspection? ( dev-libs/gobject-introspection )
-	kernel_linux? (
-		virtual/libusb:1
-		virtual/libgudev:=
-		virtual/udev
-		ios? (
-			>=app-pda/libimobiledevice-1:=
-			>=app-pda/libplist-1:=
-			)
-		)"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/intltool
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-src_prepare() {
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-
-	epatch \
-		"${FILESDIR}"/${P}-create-dir-runtime.patch \
-		"${FILESDIR}"/${P}-fix-shutdown-on-boot.patch \
-		"${FILESDIR}"/${P}-fix-segfault.patch \
-		"${FILESDIR}"/${P}-fix-typing-error.patch
-}
-
-src_configure() {
-	local backend myconf
-
-	if use kernel_linux; then
-		backend=linux
-	elif use kernel_FreeBSD; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	econf \
-		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable introspection) \
-		--disable-static \
-		${myconf} \
-		--enable-man-pages \
-		--disable-tests \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-backend=${backend} \
-		$(use_with ios idevice) \
-		"$(systemd_with_utildir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-
-	# http://bugs.gentoo.org/487400
-	insinto /usr/share/doc/${PF}/html/UPower
-	doins doc/html/*
-	dosym /usr/share/doc/${PF}/html/UPower /usr/share/gtk-doc/html/UPower
-
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}
diff --git a/sys-power/upower/upower-0.99.2.ebuild b/sys-power/upower/upower-0.99.3.ebuild
index b8a6432a2c1d..d8bb0958c43f 100644
--- a/sys-power/upower/upower-0.99.2.ebuild
+++ b/sys-power/upower/upower-0.99.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.99.2.ebuild,v 1.3 2015/04/21 21:32:20 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.99.3.ebuild,v 1.1 2015/07/04 17:14:47 pacho Exp $
 
 EAPI=5
 inherit eutils systemd
@@ -11,13 +11,16 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+introspection ios kernel_FreeBSD kernel_linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.34
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
+
+COMMON_DEPS="
+	>=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.34:2
 	sys-apps/dbus:=
-	introspection? ( dev-libs/gobject-introspection )
+	introspection? ( dev-libs/gobject-introspection:= )
 	kernel_linux? (
 		virtual/libusb:1
 		virtual/libgudev:=
@@ -26,12 +29,19 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 			>=app-pda/libimobiledevice-1:=
 			>=app-pda/libplist-1:=
 			)
-		)"
-DEPEND="${RDEPEND}
+		)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPS}
+	doc? ( dev-util/gtk-doc )
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	dev-util/intltool
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
 
@@ -53,6 +63,7 @@ src_configure() {
 	fi
 
 	econf \
+		$(use_enable doc gtk-doc) \
 		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
 		--localstatedir="${EPREFIX}"/var \
 		$(use_enable introspection) \
@@ -60,7 +71,6 @@ src_configure() {
 		${myconf} \
 		--enable-man-pages \
 		--disable-tests \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--with-backend=${backend} \
 		$(use_with ios idevice) \
 		"$(systemd_with_utildir)" \
@@ -69,12 +79,6 @@ src_configure() {
 
 src_install() {
 	default
-
-	# http://bugs.gentoo.org/487400
-	insinto /usr/share/doc/${PF}/html/UPower
-	doins doc/html/*
-	dosym /usr/share/doc/${PF}/html/UPower /usr/share/gtk-doc/html/UPower
-
 	keepdir /var/lib/upower #383091
 	prune_libtool_files
 }