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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 63 insertions, 19 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/Manifest b/sys-fs/udisks/Manifest
index 127d246a392b..71e6d929fb56 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA256
 
 AUX udisks-1.0.2-ntfs-3g.patch 198 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539 SHA512 3e9ba97d3d413e43df2c9e76dc88d9dc58d2f168509587228fc6c7b353111c9976b3cd1220bd4904d0e12ed2d804cd0807293a0982a8ee397692c676c567e716 WHIRLPOOL 365a00e248d6fe4ac7e5ce18a92b6f76611461ffe5c186e29eda521809381e3ec2c1bcc71b34f35513befdfcc99bec09fd741246a62e1b6feb48e95c31f841cc
+AUX udisks-1.0.4-kernel-2.6.36-compat.patch 1441 SHA256 6b9ebe47adde63876b890f90b22979dd53c26ffb7e38171e9bd0e152f22f48aa SHA512 da57b1f431606d04a0b4d0590ad58b8caa6a317c301dcb650bd08a9aca292cc983711ba27fd6a8f6e4d0cd4d05198f08a99bb3913eec6079cf73a5fa893f3e01 WHIRLPOOL 4c9a5df9a11841d20945d625510a495c23571d2568c0e2e71851dd6f9d6c044021be268c706931dc7895cbb7a36b9b8a8e8fe9d0a92b0407986e704f2264bbaf
 AUX udisks-2.x-ntfs-3g.patch 374 SHA256 3d3964bc7ea65aff3720e5afa6d98584a48b03c3a47aff11d888ac6e103b6aeb SHA512 572708d4386c3b90cf77f19cc54d38a2f588e4aec044caf4c74e6cfde8f2118f11a4aef5b63225163cf650b59b9c0a01eb77d679b0b398fa17b70fa1cdeb5013 WHIRLPOOL 962182b4f4c79acc8fa183d430e675346f56075724b3cabec49a3cf2511f85036a6cfe9234b9455f6dda97f739aab14f1f1b2893c0b2a1edd09351950ecafe5c
 AUX udisks-2.x-pragma.patch 988 SHA256 d260b28ccde0b55f548a62989e326acdf18241c93b4822688fc768f16757c1b9 SHA512 0dbce04d26f3a863356dbd88ebc33864321361ef7f35a622dc53ed06c403d177d779cbefce168301d52308a095e3548c3007200d23e60f5f804a582057e2961c WHIRLPOOL 95f8a33fec4a972d446e0a992f964b6c56dccad0b5540ce559a0cce82cd98d9e3c94108ce80a2fc97bd7f55332f2074b7be0a1c11df46df4141e20658041fb2a
 DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-2.0.0.tar.bz2 747405 SHA256 aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb SHA512 87522f5998ff7b67ad157700803441f7179f23a43e29e804f5e152501c7fc88a08d2633175004449378dd34f5d7fed8138398110c1441eb6bb904cd0284b4e9b WHIRLPOOL 7d8221301c206bb91802d54d97d71c7e96c1ef1c0c9ca37078a98b3a08d0cf0bac1027b15af98c21bc20645155c8425991392c2296c853ab6cc6163f47074df1
 EBUILD udisks-1.0.4-r2.ebuild 2350 SHA256 c262276dcbbf705c45def2692bb87a5d0a6ea9603ff9d0d366f9d248787109a0 SHA512 abc1800d58b0dc574b72f343bae54dd76cecbe2879843fcd5fa8d0f155ec43c7556c55c9f312bb0ea361adebd65d40f9ec750174ba4a03fec6bc1114b9ad0263 WHIRLPOOL 693d8c1e96db618fd24e086a9b8f9201820d12bdeac493290a017872444b7c4732b93e777aabc57c19c2a35f5739041df9e80f202f4585a8c8ff54dae9b0e484
-EBUILD udisks-1.0.4-r3.ebuild 2661 SHA256 472a258b228dc7f194ae78c96747d8a663969d2a16533cbeffd44068f20e6f5b SHA512 c1e9f569c26fd014fcd7dffbdcdbf168c43876b97240c0cf1afdf54762469a411d2de26e88464b323e55fcaa93498821930a19b6017c64901f1d1fe72ec03e98 WHIRLPOOL a353e8fec2af6306e99a74de8b97a80fc346a3dd2006b508bf287905001464c3d0bbb1be40c8466509e2259526ac1663737be71c61ab82c394b3f27a5353949a
+EBUILD udisks-1.0.4-r3.ebuild 2602 SHA256 58f4453d20c006e4bb77a767372b33d76619c92693ad59a95f64152c98ae0834 SHA512 9f55bb0a6687562543a7ab2c74e8bb16b6781d640d24473b7ef627bd7e96e07244f654bbb6876ae55cc5dacbe38ca350e79bb011a39480761379cf6ab6b80625 WHIRLPOOL 7d400962e01d7e6601e581ea18d0cfa576ca1f265385d76f2023f8d0335ab760e2cefee53b58fdf43c3c41a30739cf781bba56657e70d6a930fbde5c6f04eece
 EBUILD udisks-2.0.0.ebuild 2876 SHA256 1795edd8e2e270b5b2138707b2a4dc89854e7a859856ca4aa0be212dd922d37f SHA512 8f60ef9f549b9ef1714ce0e36017adef6238e9b706d47cd932c4d703d38ed05eeb36ebdacc7c04006aee5dd4abc3871978310e7c6770ea4967a58cf858b0f63e WHIRLPOOL 32faa65f827ac590036182f54f4cd377a0db09d31c20f998344ef6b78ebf207ec96eb2ecca79ee7042b3cdb97117aa10ac0a4d71f98754d379ec51c494a5d423
-MISC ChangeLog 14960 SHA256 82a12f75e468dc9e32271992c90ab0e61475cce2367a5d77abd10f675dc28746 SHA512 cb3509886e96cb43c6085d3026b6572dae3490a92a6958045b9a442dfd98a76b38f4e231b53b0e7635e2da8d02765b093a4a400021fb5ffdb612acbfdc2bb23d WHIRLPOOL d6b48b6d9f174d6b48b64ab6e4b06a9aa0f5e344f74b79c8390e57d96ef886d552276f24b45e7ae967a54a4da30b1c38ea0e6eab56b3d2df09b3c34e04533d6d
+MISC ChangeLog 15225 SHA256 de1769b5d9b85902225c96f9d4e5f068e5c9f36a4591cc7d695e87516909b3f6 SHA512 48d54ba7502f64c86e8e5959fe633b72046fe776577ab490c14da273378c28681b191e58629058c5b93e3e9aa349e62dcd8d27bf340a9ef27e2b13e39c9c48c7 WHIRLPOOL 518977688692d32b3d93308f495c4a84a7fc237bc12484d1b9edb95805949cbf53c0acc3e7453ec469c0f2e45cbf29eb7f0e134fabe6fa027360a3c10dad6418
 MISC metadata.xml 673 SHA256 17e74f564943ba8dc4c7fcb8950755cf0cecdd88c9ab0fe7485ef2a363000f8c SHA512 f5004914ab449164d2cc9146a18215bbbffbf1fe09ed5078ea4cacc02ce83f0ce25b49a9e0e67c0cce6f7e0f0ff0099a0c3f66b59c36407ace837285525054bd WHIRLPOOL ed7342b97f9efcc5e5b88c543f34aa4b2228110685550ce7dfe8e3e0f1a3ce13a0aa0d36d49313156130578e78db030a5db03c603a9b1c2f78d097e6c54ba3dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQa942AAoJEEdUh39IaPFN0n4H/3cx/yERjCEu6Mu1GR9ccvrc
-xGWgm/Ie/8GbaagFtyoeeHpobVsJSPLM20/RvM0prItQj514PjAp23p/+OmbcxYV
-h7Vj2/C5B2Bge3lLbHmJYe8DtkvJ+Vved4qy6JosQqCB3JXYEkh8nFEgMyR1LBei
-LpRw0yqt7DI+oEiwZWvnY5J+pZsg6b8jRrASSfuuJLNsh1QzD2se6exn6TzTN5j9
-dQ+hVh/WLrXj13JnGgwPDNnJ8j6qCThByBqlPTTi7N4VSSYHO7siwEzMzWgNATQ/
-MgdbLsSt9ljUTym7nhDTJTy8t86+DzZ9/8AYMcp4jAnpbayPbiVS0p1tU9fly6g=
-=ef7d
+iQEcBAEBCAAGBQJQlnIkAAoJEEdUh39IaPFNLo0H/AlrDNxMxa/l5oeV2GldfzPH
+oJUda7gTfYFS3CFuxUv2YXkuyLqZxadqdE49FagKhVG9voAX1zSMspuN6gxKardu
+bGaYVPriU1KchrPI/EII2uMZ4wf4HZaC6Z0LYfDIm1G4quz1RDJDnIC2v8x/Y0+Q
+/dYeLIIcvOR8TLCKHDfw8wrkH39awMgnJe+GPzjLrvDdVIYONQpm6EA9SHwGoIRs
+IsVLk3hzbfYI4xdDHIOnOSnO8ojryIh+AoMVFFZjPors73jRsPsAXvRlroqe5xBe
+5habQKePrfOsWoHta2QDlHtIejmCXSWIw8AwHlRf0qv6TPpBNws+VWd1l8bJkE8=
+=uU7z
 -----END PGP SIGNATURE-----
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