Fix encrypted swap detection, bug #292090. Use slotted virtual/libusb dependency in all ebuilds.

(Portage version: 2.2_rc50/cvs/Linux x86_64)

5 files changed, 117 insertions, 5 deletions

diff --git a/sys-apps/devicekit-power/ChangeLog b/sys-apps/devicekit-power/ChangeLog
index b964121d6a3a..79bcb914daa7 100644
--- a/sys-apps/devicekit-power/ChangeLog
+++ b/sys-apps/devicekit-power/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/devicekit-power
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.4 2009/11/01 12:45:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.5 2009/11/16 21:57:32 eva Exp $
+
+*devicekit-power-012-r1 (16 Nov 2009)
+
+  16 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  devicekit-power-011.ebuild, devicekit-power-012.ebuild,
+  +devicekit-power-012-r1.ebuild,
+  +files/devicekit-power-012-hibernate-encrypted-swap.patch:
+  Fix encrypted swap detection, bug #292090. Use slotted virtual/libusb
+  dependency in all ebuilds.
 
 *devicekit-power-012 (01 Nov 2009)
 
diff --git a/sys-apps/devicekit-power/devicekit-power-011.ebuild b/sys-apps/devicekit-power/devicekit-power-011.ebuild
index 10596283eb7b..79cf16231e0b 100644
--- a/sys-apps/devicekit-power/devicekit-power-011.ebuild
+++ b/sys-apps/devicekit-power/devicekit-power-011.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-011.ebuild,v 1.1 2009/10/29 23:41:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-011.ebuild,v 1.2 2009/11/16 21:57:32 eva Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.21.5
 	>=sys-fs/udev-145[extras]
 	>=sys-auth/polkit-0.91
 	sys-apps/dbus
-	virtual/libusb
+	virtual/libusb:0
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
diff --git a/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild b/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild
new file mode 100644
index 000000000000..55a113b9e4d9
--- /dev/null
+++ b/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild,v 1.1 2009/11/16 21:57:32 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 linux-info
+
+MY_PN="DeviceKit-power"
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
+SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+
+RDEPEND=">=dev-libs/glib-2.21.5
+	>=dev-libs/dbus-glib-0.76
+	>=sys-fs/udev-145[extras]
+	>=sys-auth/polkit-0.91
+	sys-apps/dbus
+	virtual/libusb:0
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	doc? (
+		>=dev-util/gtk-doc-1.3
+		app-text/docbook-xml-dtd:4.1.2 )
+	app-text/docbook-xsl-stylesheets
+"
+# docbook xsl is required for man pages
+# FIXME: needs dbus-dtd currently only available with dbus[doc]
+
+DOCS="AUTHORS HACKING NEWS"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+function check_battery() {
+	# check sysfs power interface, bug #263959
+	local CONFIG_CHECK="ACPI_SYSFS_POWER"
+	check_extra_config
+}
+
+pkg_setup() {
+	# Pedantic is currently broken
+	G2CONF="${G2CONF}
+		--localstatedir=/var
+		--disable-ansi
+		--disable-static
+		--enable-man-pages
+		$(use_enable debug verbose-mode)
+		$(use_enable test tests)
+	"
+
+	check_battery
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix crazy cflags
+	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
+		|| die "sed 1 failed"
+	# Drop this command line option, because only available since gcc 4.3,
+	# bug 289873.
+	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
+		|| die "sed 2 failed"
+
+	# Fix detection of encrypted swap partition for hibernation, bug #292090
+	epatch "${FILESDIR}/${P}-hibernate-encrypted-swap.patch"
+}
diff --git a/sys-apps/devicekit-power/devicekit-power-012.ebuild b/sys-apps/devicekit-power/devicekit-power-012.ebuild
index 8cba66566892..f1765785abae 100644
--- a/sys-apps/devicekit-power/devicekit-power-012.ebuild
+++ b/sys-apps/devicekit-power/devicekit-power-012.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-012.ebuild,v 1.1 2009/11/01 12:45:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-012.ebuild,v 1.2 2009/11/16 21:57:32 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.21.5
 	>=sys-fs/udev-145[extras]
 	>=sys-auth/polkit-0.91
 	sys-apps/dbus
-	virtual/libusb
+	virtual/libusb:0
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
diff --git a/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch b/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch
new file mode 100644
index 000000000000..18210ec72574
--- /dev/null
+++ b/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch
@@ -0,0 +1,25 @@
+From 390c5b3aeb3d07ff6de3594fd08370e43b43c652 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Wed, 21 Oct 2009 09:26:48 +0100
+Subject: [PATCH] Fix a trivial copy-paste error that broke hibernate for a lot of people
+
+---
+ src/dkp-daemon.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
+index 20e65f8..eb16a63 100644
+--- a/src/dkp-daemon.c
++++ b/src/dkp-daemon.c
+@@ -563,7 +563,7 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
+ 	}
+ 
+ 	/* encrypted swap? */
+-	if (!daemon->priv->hibernate_has_encrypted_swap) {
++	if (daemon->priv->hibernate_has_encrypted_swap) {
+ 		error = g_error_new (DKP_DAEMON_ERROR,
+ 				     DKP_DAEMON_ERROR_GENERAL,
+ 				     "Swap space is encrypted");
+-- 
+1.6.5
+