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

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 32 insertions, 259 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/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
 }