Create the history directory in /var at runtime. Fix segmentation fault. Since it might take a while 0.99.0 can be keyworded.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 170 insertions, 15 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 9aa4fd725adb..28e316c8e6bd 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.139 2014/03/14 10:07:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.140 2014/03/14 13:40:16 ssuominen Exp $
+
+*upower-0.9.23-r1 (14 Mar 2014)
+
+  14 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/upower-0.9.23-create-dir-runtime.patch,
+  +files/upower-0.9.23-fix-segfault.patch, +upower-0.9.23-r1.ebuild:
+  Create the history directory in /var at runtime. Fix segmentation fault. Since
+  it might take a while 0.99.0 can be keyworded.
 
   14 Mar 2014; Agostino Sarubbo <ago@gentoo.org> upower-0.9.23.ebuild:
   Stable for ppc64, wrt bug #496532
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 8544cdf7174f..c3e768a21933 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,30 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX upower-0.9.23-create-dir-runtime.patch 1164 SHA256 6324c148d436e3f898b73b445411f29a7527c65ffedb574ef658c1eaaa1aa4de SHA512 1aaec53df73aa50fabffaddd380800f7ed78caddc02b16834831aa1faa09c795e0def04493f64d852a9b07b9ef4007352e111c5d7cdc1f1b2ed8043c445751f2 WHIRLPOOL 4347f169597c8e144081673d038809a4f0525410aef7e3ff3b713f22dd28e1d7f4bcc69413be2d3c87e7e228dc8da6cfab7b6a3e63feeafafb6e8dc5d4d3a018
+AUX upower-0.9.23-fix-segfault.patch 829 SHA256 c80d1510b3e3d0579ddbec328d2800ab7e112378f9a8ff9ef152d72de50a45c3 SHA512 31a6b5414ddd17cbbcf318da98907d745910e7632ea9a4d4d5c02eaaae87857b5bb88f9ab2f336f7b24637727005fb839f8c9564b82e56ae0065d57b1ce19ad2 WHIRLPOOL 4286fadfbb45b89891ca4aed49b11cde70afa357101f4b9b150d9f68e548af28436fa25a9d8143f7d90daaff0ee22238dd017f10e1e34e58a226553a84724682
 DIST upower-0.9.21.tar.xz 421204 SHA256 13c28e0a700291a322e0674894fedfd695889845ab82df2aafd699aa9bdbb2e2 SHA512 71f3d0bd328265094792cf1e91fb57952fa275415358c50286fb177b212867ac670a27b7caf84072552b5d84e665f9387a4998a5c04d2b9f92d4415a77885ab7 WHIRLPOOL 3378d9cf3d3c4c35ff801e85213f047d4eb481413801851d3b83bd39c46b5b8354663d00f7e5c1e0c8c162fad8bd0a2040164dec72c340510968e549a590b59e
 DIST upower-0.9.22.tar.xz 395800 SHA256 d31e81b5123c597df1bd246a371dd5eec88b3fdef5f514086f153577e3215f11 SHA512 48a85d007fa2b7e07772b8641f1b71e88b11b1fde708f6ea321df74743f3c8901eefa4eb4369dcc9a63d89b2203fa81cc872ff6b905ff6be501bca6d92f54f3a WHIRLPOOL 726177f66327972f7c5612963f20a516786a25ae7615ee8d5bb2709061759d35ffd8c226e019aa423d63baaddbe6c79b0d21d29aa4ee813ccdb611107154affc
 DIST upower-0.9.23.tar.xz 425804 SHA256 433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b SHA512 526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d WHIRLPOOL 1599739198767ea6c70e133d50302a62a5b0b07c3786057b75636167c80b02d8e0ab6cc4781ac08994b249ffb57875bf186923d441e0b10e73c238b6be5b3538
 DIST upower-0.99.0.tar.xz 429076 SHA256 5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1 SHA512 efb9544730a1baa8abdc5af4b5320ec1fa7518bdaa9e56129eef4aa4caf8167c7bf72f7bc0e71ca7b6d127a1464462667b86039a4c5248c8c75c66334e038ea7 WHIRLPOOL 15634811ae267a9811933c75af25321e885d9646782c21cac237d20bea4a673930af3bf9a1873d5295e31676714c64ef6fb187c780b903e872e4e6677b615e20
 EBUILD upower-0.9.21.ebuild 2080 SHA256 bcff19873384ca4cb7fd801626efc64d170c2fb792ab0965f2c0a71a8d75f944 SHA512 7f14196e2d085a9cced5047bcd3b2d1c0af36bc46644cff90d4a2d42f9aa12f46f1f8fdbe36c40d0c49c596c2555908ea3712c89229166ad1a3b3bb2379b5eca WHIRLPOOL 3189a62bcc913d15deda72451dbcbf9be725e699edd9af76b343149a8b2ace2b6e945b7a456a11cf99aa417268d1e62a37032f039479ac040de42d5c569dda60
 EBUILD upower-0.9.22.ebuild 2094 SHA256 6d1d45f983bd42fd2c978d92ea0769c099e8a698d033db0061a0e9f9ff6948f9 SHA512 878321989e14104a5d6fc78e9287b07cb319ec24641d88f099b586e788c6f724882f935f7fd15fa0f85453c4e20f10e12a688d7312b8e19d20a8e008976f66e0 WHIRLPOOL d9346d2f96d0779dbaa3776f66023abd0d603971786867c277683b16381021bea416617a88b34d5a11e0e160d83891225b987b28740fe96bac136d1bd4d91ec0
+EBUILD upower-0.9.23-r1.ebuild 2196 SHA256 eb3754cb81aa549badddcd50b1dfe8241db2e784cfca58d9d062a2c2b0ef81f0 SHA512 ecf930c3490629640ef8b1ca9678a240b58742e30c9bedd5315b766cad5d982986a81865d92df344ca57ccab0841c6961ecb6072851493b4453d3fdf2425d59b WHIRLPOOL b74a706b56b64e4b453c0064e101ff9c00303793aad810f13b2ba9822fba032990bcbdd2f74449476afc98c548c9e6d3091e3eef507064d84b25cf53b7eebb16
 EBUILD upower-0.9.23.ebuild 2081 SHA256 49071da1f8e38c79865881fc0c5a95da43a0d338ce387969f8f0927a2373678e SHA512 c2769cc68e2369dbaae712441943f5a1a3ae4e7e36df7d198d4f4f151a4af248f1a1a410581690bcd017208a8eda53db61a6f8990a782c5690ab713cde016c01 WHIRLPOOL b28bbdc09465749ca6194a7d2ee1760aba7f0a8b442de44ec11c8bcadf6ff97b13cfdf074d27c6f172d2b84ab254a296df60cbb356738d3bf44baf8311d410f0
 EBUILD upower-0.99.0.ebuild 2252 SHA256 9cb45aa9898c79122e4302eded7b1f5f95395cadc98e352e78f547527165b90e SHA512 5d65aca682244baf730baa7bccc32292c7628100779a2702df014f5af5919aacfd4ce0dfec822062530290e5032b1a6ff915d3321a3c67863a1150f0d5ff99b6 WHIRLPOOL 5829bc447c83ae08dc844232b33c00f9a2cea584269bde59dffa733da9881636a3e66a5d42caa8b679a54313917f0dc6d549999f0464601877ed60192bc5cca6
-MISC ChangeLog 17231 SHA256 4341b9680f4883d7f3614d1f5cd18360abf34dbfb9f7bd6c1d3c4e85c57915fc SHA512 1ea39f0aec79632fdfe50c36c87af2a7cdb39eb5c280655837eb27207ab19e396a0108941d7dd1c0b40e895bf7c7a4cbcdb945140b3a10a44f2eca0a583eae70 WHIRLPOOL 3d7ff99a050aac90f9cc208353f7d6ab5d2774e80d6513f33deb917d26769fe54de4c567698e11cf9bf956bfa3b6a6855d25eecd8f7c1adbc6901ebeac8e24c9
+MISC ChangeLog 17573 SHA256 95423caf44c4720d0f82deaef61c79fcf3b8f151de29da8bbe20d7c37ffc4e08 SHA512 57d926b34b755edd0bd027896d92454007e4110249ff94a52c1b8eee40c7a82f84d43d90322da3aae06a78541420ef66ec09966c69a986bac225624dcd166579 WHIRLPOOL 40da4cbf94f495d308551525eb1fd3e8c13e8617476129edb058436a1278ecb949735f9ea75f6e6993d19dd87b53c54a0dbbdd88d0fa71374e8546ebd7f410ee
 MISC metadata.xml 239 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8 SHA512 ab6b74388bf69a67b0d1f4283475f97eb5a731f31b5c9db4ee50b819a846c77d4ef09f63856e31a68b0bfdf18ee3baa6c76720d4345ccadf154385caaf1033bb WHIRLPOOL bcac6415c046557e53bf04579e077fed4d694dee8f7c0faeecf15f3f036137a2c9f0eaa0c492cecef23a45bd5af2c45542acd26641209d3c9be3108bf1ff09a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTItTqAAoJELp701BxlEWfAk8QAMSnXR8WP6uZyRMxaEip7ZYW
-XW4U9r8sIpzDnFlnfQJN2hzf4DcVManap4y9JqT6yvwzv9jrPkTx4kGjloDpmKjM
-hCcbGKy92CCXrcZW8SIaCYoOa8Mc2rznDMYHiTBa5KQDAvn30IarTYdToQHaUdt6
-jK58TP6FSrDIIip9XZobLLPWVa4uSr7dF9ES+kw0P0SK6z5kNz2Ac4mXPZRdezx6
-FLmmNUbK2QLdgHRPrHxGNyD4XnCIVLDWjE//WyLWa13+RHx9ceAqP5NXGqziPuYz
-utXF0/YNgquaMJ8Olm8KJzaoRfNdL1QOwAgFI4FmCtiZLxw1f1m1LhvSeWT20oMQ
-1mhZOmEQdl+DyZyx/MBzJpB4TiXd4mgcUuRKr0pdfMN4SCpZDqd50y/5OP0mxv8i
-u+0j+H5YQdIKzJDRryNJCJ2nGcQ2W9y8+e0FkeMYGn/KaOfgEXbZBnvvusgrFR13
-t2KUn23TOXlnO5x7vagNAsKcZlixuUcd3sbqh6HXqubEbFYuoZMWbjiwdIDB39Iz
-mDHm+vNw0Wvr7mHt1x9ZgYXpsEURqFcUT3KclfJaD5mo9L5VXK1fNXhyrH2UL7rD
-LvcXhehTlgolI5R7/zxFRiZs52oVji/MlZk4Ve1T3vrJtHqYJ9U1Wn4fjXCm8qWP
-qod4AUb38szfG/peCnIb
-=D6KC
+iQEcBAEBCAAGBQJTIwXYAAoJEEdUh39IaPFN9EUH/iiBxBmEI001o0kMOOhK/7X6
+fQ0QuQ4jq0Wj3dCMzaplSnNx+k8KLjkeVN11NJOAxkAI0NWkMh8TA8huqX2m5hTa
+VpxWr+u5wrInirhFc1rzLB8Xxh6DlcpNYgLymCbB14wXyAxsR0FL7RjsMkMMkonk
+wONs1jfkEW7TbLadL0hMHZq1t/dlUhED9xFqwJkq+cRAT38YxCLDiKJpwSjwp0TJ
+h5DB1++LS8/lyft/Fsg+wQoIGctaKfYRNrinjIXk5e6naeVpqtCzr6H236SJgqSa
+7PAY/lRAKRv3xXcT9Tm0luMnqjtXLLBlSRSDJsjuu9Vrkls3yZ2/ZdU9cqORTCE=
+=jzxn
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower/files/upower-0.9.23-create-dir-runtime.patch b/sys-power/upower/files/upower-0.9.23-create-dir-runtime.patch
new file mode 100644
index 000000000000..34340d44ec30
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.23-create-dir-runtime.patch
@@ -0,0 +1,34 @@
+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.9.23-fix-segfault.patch b/sys-power/upower/files/upower-0.9.23-fix-segfault.patch
new file mode 100644
index 000000000000..3e8976320777
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.23-fix-segfault.patch
@@ -0,0 +1,24 @@
+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/upower-0.9.23-r1.ebuild b/sys-power/upower/upower-0.9.23-r1.ebuild
new file mode 100644
index 000000000000..170aaec9deb6
--- /dev/null
+++ b/sys-power/upower/upower-0.9.23-r1.ebuild
@@ -0,0 +1,92 @@
+# 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.9.23-r1.ebuild,v 1.1 2014/03/14 13:40:16 ssuominen 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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc +introspection ios kernel_FreeBSD kernel_linux systemd"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.22
+	sys-apps/dbus
+	>=sys-auth/polkit-0.110
+	introspection? ( dev-libs/gobject-introspection )
+	kernel_linux? (
+		virtual/libusb:1
+		>=virtual/udev-200[gudev]
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-1:=
+			)
+		)"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		!systemd? ( >=sys-power/pm-utils-1.4.1 )
+		systemd? (
+			app-shells/bash
+			>=sys-apps/systemd-200
+			)
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		)"
+
+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-segfault.patch
+}
+
+src_configure() {
+	local backend myconf
+
+	if use kernel_linux; then
+		backend=linux
+		myconf="$(use_enable !systemd deprecated)"
+	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 \
+		$(use_enable doc gtk-doc) \
+		--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
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}