Migrate to udev.eclass. Backport Linux >= 2.6.36 compability patch, as in, use power/control instead of power/level when available.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 53 insertions, 10 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 3073cba11fb4..c1e8006589a1 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.105 2012/10/03 06:44:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.106 2012/11/04 13:53:22 ssuominen Exp $
+
+  04 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> udisks-1.0.4-r3.ebuild,
+  +files/udisks-1.0.4-kernel-2.6.36-compat.patch:
+  Migrate to udev.eclass. Backport Linux >= 2.6.36 compability patch, as in,
+  use power/control instead of power/level when available.
 
   03 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> -udisks-1.99.0.ebuild,
   -udisks-1.99.0-r1.ebuild:
diff --git a/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch b/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
new file mode 100644
index 000000000000..fef15ea20852
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
@@ -0,0 +1,39 @@
+From bf5c28a8dd4eedae51db27fa7b9f84dec425f8bd Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake@gmail.com>
+Date: Sun, 04 Sep 2011 18:42:17 +0000
+Subject: Fix power/level deprecation kernel warning
+
+If present, use power/control instead.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=32056
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+---
+diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
+index fc88043..eeafcab 100644
+--- a/src/helpers/job-drive-detach.c
++++ b/src/helpers/job-drive-detach.c
+@@ -235,7 +235,12 @@ main (int argc,
+   if (endp != NULL && num_interfaces == 1)
+     {
+       g_printerr ("Suspending USB device: ");
+-      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/level", "auto") ||
++      if (sysfs_exists (udev_device_get_syspath (udevice_usb_device), "power/control"))
++        power_level_path = "power/control";
++      else
++        power_level_path = "power/level";
++      
++      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), power_level_path, "auto") ||
+           !sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/autosuspend", "0"))
+         goto out;
+       g_printerr ("OK\n");
+@@ -259,7 +264,6 @@ main (int argc,
+  out:
+   g_free (usb_interface_name);
+   g_free (unbind_path);
+-  g_free (power_level_path);
+   if (sg_fd > 0)
+     sg_cmds_close_device (sg_fd);
+   if (udevice != NULL)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/udisks-1.0.4-r3.ebuild b/sys-fs/udisks/udisks-1.0.4-r3.ebuild
index b838edc8c467..3037179b710f 100644
--- a/sys-fs/udisks/udisks-1.0.4-r3.ebuild
+++ b/sys-fs/udisks/udisks-1.0.4-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r3.ebuild,v 1.1 2012/08/06 11:46:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r3.ebuild,v 1.2 2012/11/04 13:53:22 ssuominen Exp $
 
 EAPI=4
-inherit eutils bash-completion-r1 linux-info toolchain-funcs
+inherit eutils bash-completion-r1 linux-info udev
 
 DESCRIPTION="Daemon providing interfaces to work with storage devices"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
@@ -45,10 +45,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
+		"${FILESDIR}"/${P}-kernel-2.6.36-compat.patch
 
-	local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s:/lib/udev:${udevdir}:" data/80-udisks.rules || die
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" data/80-udisks.rules || die
 }
 
 src_configure() {
@@ -72,14 +73,12 @@ src_test() {
 }
 
 src_install() {
-	local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	emake \
 		DESTDIR="${D}" \
 		slashsbindir=/usr/sbin \
 		slashlibdir=/usr/lib \
-		udevhelperdir="${udevdir}" \
-		udevrulesdir="${udevdir}"/rules.d \
+		udevhelperdir="$(udev_get_udevdir)" \
+		udevrulesdir="$(udev_get_udevdir)"/rules.d \
 		install #398081
 
 	dodoc AUTHORS HACKING NEWS README