Version bump wrt #319761 (with patch reverting upstream commit to restore resume and suspend functionality by Priit Laes).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 123 insertions, 2 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index b5af0a7af4ff..6f88cd1c946e 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.5 2010/05/11 08:35:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.6 2010/05/15 11:29:22 ssuominen Exp $
+
+*upower-0.9.4 (15 May 2010)
+
+  15 May 2010; Samuli Suominen <ssuominen@gentoo.org> +upower-0.9.4.ebuild,
+  +files/upower-0.9.4-enumerate.patch:
+  Version bump wrt #319761 (with patch reverting upstream commit to restore
+  resume and suspend functionality by Priit Laes).
 
 *upower-0.9.3-r1 (11 May 2010)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 0902da4d1053..78cc7d8cf345 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,4 +1,7 @@
+AUX upower-0.9.4-enumerate.patch 847 RMD160 f2487429e40447f3f3216226b8cdac06bc7c00d2 SHA1 86763eeea830e3a2805f3470b3abafbe626e4bc0 SHA256 7314530bb1609d24fa25b04519a8dbbab9378fe0a241d6af1e5a18ccab5160c8
 DIST upower-0.9.3.tar.bz2 468427 RMD160 dbb4a269eae3d5f4eabe76a61513c098f6c15231 SHA1 1682091f037a28675323d6603edf5fdd803f9646 SHA256 05eb4bd73493c779a6972893d7439f92ca8cc30cd81cf00663cfb4dca10896a1
+DIST upower-0.9.4.tar.bz2 468727 RMD160 4403b090e831c63e6ae3846d8ccbc1c7e8d8516c SHA1 35a25ecec2f45a0f92ef5b5f916fca37703b8fac SHA256 39dd138781b2a2d820f1a2bde4ca60dbf99e6def0e0010d4c3d3f4707954a57c
 EBUILD upower-0.9.3-r1.ebuild 1973 RMD160 c14bd90b6ec1bfd3ad85bfb8c7286422a569e9bb SHA1 dedd62b37084ce6af3069f70532853c0f08e344c SHA256 f3a970624dad03bd047aee00fa44d9b74a3b9240e6dcb67c526534e7cac57771
-MISC ChangeLog 962 RMD160 fd8e9011a90c76138b55674d3d2c2e68ddedc171 SHA1 73defabbb21fe5a455d8555fd615128a0ce5897b SHA256 52db52380c5235ad95b68a375f877ae21a45c09e9192be1debd97a2b2d9e3441
+EBUILD upower-0.9.4.ebuild 2021 RMD160 80ca7216a27ae8a3a0ffa6c53c6780322b351255 SHA1 8c3d62ccae05939352531b35a4add9fd19085ece SHA256 8081f43727388fc3f750d813c88de0646115bc79f1fe9c135158c58c33d7a01a
+MISC ChangeLog 1234 RMD160 c3d917a33b0ce6b32671ee5f991df2d7498c96bc SHA1 23ecbe3ff81caf6f920757b9241fa9da55ef9eb5 SHA256 8284e6adbd2f75587a4c0763ca474825c88f9f15f4326e5a0e3777239d9072db
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/files/upower-0.9.4-enumerate.patch b/sys-power/upower/files/upower-0.9.4-enumerate.patch
new file mode 100644
index 000000000000..9494fb8527b0
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.4-enumerate.patch
@@ -0,0 +1,29 @@
+From 9ba7ef8e0a137e9e574c4fc3f4cde6a8370ebf7c Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sat, 15 May 2010 00:19:34 +0300
+Subject: [PATCH] Revert "Ensure we enumerate devices before we start monitoring them"
+
+This reverts commit bcc0c2ced07a778a41a06a0e52be37b1bbbba551.
+---
+ tools/up-tool.c |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/tools/up-tool.c b/tools/up-tool.c
+index d698c7c..a691744 100644
+--- a/tools/up-tool.c
++++ b/tools/up-tool.c
+@@ -331,11 +331,6 @@ main (int argc, char **argv)
+ 	}
+ 
+ 	if (opt_monitor || opt_monitor_detail) {
+-		ret = up_client_enumerate_devices_sync (client, NULL, &error);
+-		if (!ret) {
+-			egg_warning ("failed to enumerate: %s", error->message);
+-			goto out;
+-		}
+ 		if (!up_tool_do_monitor (client))
+ 			goto out;
+ 		retval = EXIT_SUCCESS;
+-- 
+1.7.1
+
diff --git a/sys-power/upower/upower-0.9.4.ebuild b/sys-power/upower/upower-0.9.4.ebuild
new file mode 100644
index 000000000000..6669a4c6a8d5
--- /dev/null
+++ b/sys-power/upower/upower-0.9.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.4.ebuild,v 1.1 2010/05/15 11:29:22 ssuominen Exp $
+
+EAPI=3
+inherit eutils linux-info
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
+HOMEPAGE="http://upower.freedesktop.org/"
+SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug doc nls introspection kernel_FreeBSD kernel_linux test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
+	>=sys-apps/dbus-1
+	>=dev-libs/dbus-glib-0.76
+	>=sys-auth/polkit-0.91
+	introspection? ( dev-libs/gobject-introspection )
+	kernel_linux? ( >=sys-fs/udev-151[extras]
+		virtual/libusb:0 )
+	!sys-apps/devicekit-power"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( >=sys-power/pm-utils-1.3.0-r2 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	nls? ( >=dev-util/intltool-0.40.0 )"
+
+pkg_setup() {
+	if use kernel_linux; then
+		if use amd64 || use x86; then
+			CONFIG_CHECK="~ACPI_SYSFS_POWER"
+			linux-info_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-enumerate.patch
+
+	sed -i \
+		-e '/DISABLE_DEPRECATED/d' \
+		configure || die
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux; then
+		backend=linux
+	elif use kernel_FreeBSD; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable introspection) \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable test tests) \
+		$(use_enable nls) \
+		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-backend=${backend}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS HACKING NEWS README
+
+	find "${ED}" -name '*.la' -delete
+}