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

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

6 files changed, 126 insertions, 12 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/Manifest b/sys-apps/devicekit-power/Manifest
index d6f96003f94c..d38553e3f6c9 100644
--- a/sys-apps/devicekit-power/Manifest
+++ b/sys-apps/devicekit-power/Manifest
@@ -3,18 +3,20 @@ Hash: SHA1
 
 AUX devicekit-power-007-maintainer-cflags.patch 1286 RMD160 4d9f55caa936969ffe5df1dfdc6dfd00639322d4 SHA1 95dedce5b49dfcb06c935c0dcf5f1c8b23670534 SHA256 a87bdb4703e1c238949d951b1c7fbfedfce95af66ea9334bbaeb21a5e06d274c
 AUX devicekit-power-009-build-gcc-4.1.2.patch 392 RMD160 1dd85f5341aca85372e3f2e77e73b8381c5c56c9 SHA1 decbd6d042a5439e399166ebaebd58aacb076908 SHA256 f1613aece0da2af8d5ad8a67493bab8030f418ccf51f655617c0e21254f891e0
+AUX devicekit-power-012-hibernate-encrypted-swap.patch 805 RMD160 a6d53935c485cdc82954d735d54b5d7b919434da SHA1 e6af5891632dba4992bee374f7e15f2be978f175 SHA256 8520b6f059c0caa9afc0123b9c06dcc9671966c6e113135cbf590901c65a46cb
 DIST DeviceKit-power-009.tar.gz 496455 RMD160 46eabd609d3dc706a7651b4d34b5b6f4d3107738 SHA1 93f1d276d530107d4f49aa035cc03175b7f32ffa SHA256 438ac7f22533e04f5b44e0cf23d8b51a5cb69906ea2bbdef0581dc3c7cf19e55
 DIST DeviceKit-power-011.tar.gz 521445 RMD160 632a16f8b51621fa2723cdc46a6939919d0b54e8 SHA1 c5158e51eebb5eeaa22453e730284156d8c95fc1 SHA256 8f5b9f43c17a43574cd9026d0ff7b2f6b05d2d0e25d2033b8fdd92021fd4383d
 DIST DeviceKit-power-012.tar.gz 523183 RMD160 3c7ebabeffa5472985711939df82af72ba73d3df SHA1 caf5f8c48fbc2b1d6130b1fe282adc9511642178 SHA256 ec7eef2a7e79cb9d6f2df362172b4ee3a0e494ad828e2b0020f79ed52be9bca2
 EBUILD devicekit-power-009.ebuild 1584 RMD160 5682b4163d55ddf9060254abe6285aa8939ba7d9 SHA1 c6c5416dd17cd7bf25af9875c8d17f023ed34c9c SHA256 6b196cce773d40a2c63be5fc5f92628d896acd74a9ade94c6504642c6d497e12
-EBUILD devicekit-power-011.ebuild 1604 RMD160 85124d52046a5a10d75e7c47b6320f9ee0646aaa SHA1 f9722a27312e84ba3b41010ba0a94965d10e977c SHA256 380b10961f2884ebb2e7dcbc6d037217ab1aa92fd230154e9d69593a9384157e
-EBUILD devicekit-power-012.ebuild 1842 RMD160 00825dcc39aa253f87ccc245c1f659336c196266 SHA1 c1f26e2d7eed17c2b8bf3675d0c267f21f6f0dca SHA256 a7c25fcffc9a8528ddc6b320ca4b655e9fb017a394ac743ba5f3b89e403c3d40
-MISC ChangeLog 1118 RMD160 690e2ca17921b172ddcef0fdb6001c7c6a78ca56 SHA1 3ceb0dd718b40f388613742e5e379141449c74dc SHA256 a8dd24f3bf49d17c114c1d65aa81697bd6ee50424443a36fced1f6757d83b9b7
+EBUILD devicekit-power-011.ebuild 1606 RMD160 ef60a713509ac40605cfaa61580583f475f46490 SHA1 cf75e9b5b139aeba8b8180cc4f3e719aa60a6eca SHA256 007ebff01e0aee1c128e88b544768ef6db9d7a4cfbdaeca29a66c29f2e5220c1
+EBUILD devicekit-power-012-r1.ebuild 1987 RMD160 783f0dd9767c20d8e7ac549fb6272229f9913940 SHA1 8707716dc526ee47d2f03beeae920122eea5f554 SHA256 8a1ef6da58406ec1801dcf4721f9ce13fc571522bd41f394cbbb069ba0bf40f0
+EBUILD devicekit-power-012.ebuild 1844 RMD160 25bd02ed6e5f361d52aced36cbb2ae272415e1c5 SHA1 9b1f7be0df25204cef6435c43482644fbe581532 SHA256 b3aa6e70ebce98b5673cbaa010504e5d69240624513cff6d8c615ba5ed691ae4
+MISC ChangeLog 1466 RMD160 e352d2fdd7d4c39f38ce8324457113dae01ceb18 SHA1 9e8d6cf15ce921b8b198b527cdb0139c3bfbedb6 SHA256 9a9da134bc5fae8d9324f657214af8795ba6739843496866273312618084d81a
 MISC metadata.xml 164 RMD160 7d567afe05ca87a772eedf19f5b1fd1e2a9798a7 SHA1 e7b1ab05868d9feb1fa1677c052836fd7dd6a171 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrtgw0ACgkQ1fmVwcYIWAbDtgCg3c9vJG4AmN6UyzICsczRXUQ7
-sqEAoLJiu4emuB6pVnYMMO7pbFYRIkLd
-=2HJl
+iEYEARECAAYFAksBytIACgkQ1fmVwcYIWAZr4ACg1hW/Har6IWvRSYEA6ZaNVfP0
+eHYAnja7z30lJZY2iADooxrneBB0wu8M
+=DnZH
 -----END PGP SIGNATURE-----
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
+