Backport patch from upstream for hidraw compatibility issues with current udev.

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

4 files changed, 137 insertions, 9 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 1b36b19298fb..bd73a1ff2ff6 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.105 2013/03/20 15:44:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.106 2013/03/21 17:59:52 ssuominen Exp $
+
+*upower-0.9.20-r2 (21 Mar 2013)
+
+  21 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> +upower-0.9.20-r2.ebuild,
+  +files/upower-0.9.20-hidraw_with_udev-196.patch:
+  Backport patch from upstream for hidraw compatibility issues with current
+  udev.
 
 *upower-0.9.20-r1 (20 Mar 2013)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index fa37a686b982..a53e0c80857d 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX upower-0.9.20-hidraw_with_udev-196.patch 1333 SHA256 25b3422123fb41e70c1ec8d8c9e61624f1cbd15ee9454f04148831ab3a06e168 SHA512 bed396008a5609c4454601f4a4a9f52aa671c3aa941cc60e6594ced72176793c3405f845d0f2d5a902822fae3fbc3de459cf237d83c0523eb6bbcbddcdb7dcb6 WHIRLPOOL 4ef2e71764cf99e81128deb9f4258af9be2354c45788f80105c8af2e49133090c49e3e096ef1db19cf0f95db9cdd4d1ecbe6b2f0b3aa2fd5ae27e285998b589f
 DIST upower-0.9.19.tar.xz 411604 SHA256 54c7facb3049f3c1b6ff9510c46aa378f53a2eb606a3ce7be3f6b0a227547e14 SHA512 616502dddec23108fc51662e0e08efc2cd7893043558696ea87cc02c05b85322362be3740c81674b619f5e7acfaa42bdbd56444faab8c11820ebc427e127a9b7 WHIRLPOOL 0cbe033a8ace8520f86f025b513e20d24dbe5e529baa1df1aaebf67ec548a7433ae4f6ba433fd96611722bc7722311c57506270593bb29a942f69f0abb2b4ab1
 DIST upower-0.9.20.tar.xz 413632 SHA256 6817237486561294b1004a9a50a01a4d69f17e8d708c6baf9d92104fe2e6e184 SHA512 d78fc0f53a89e72753c6807ccec70209efa0660c9b93ecdf450c43d33a6f8e39e55ad790ce19c67d335ec137655cf701b09069dbfc68707a8ba6fdbda72fde72 WHIRLPOOL 7fc09931304ef53373cb335d912f4a61c15f5522220fde88c829a4b02ea9dd8eeb42f1070e42e2532fb17d2fea7d3b228539efdfe3337d6b32bccb4e76cbfd6d
 EBUILD upower-0.9.19.ebuild 2095 SHA256 195b11385484413bd70c7830c19b371aab80860a9335de9a730a0b3937b8ea57 SHA512 e61a932516fe971fe621028b134e38e785ac4f5fdb6b16487a4c57502b57231d4a29ac71748448dd69f6dfcb0d90908c8ac6f67800cfc00d2fe2da8226cb4083 WHIRLPOOL d49bd45c8b446ca6ca8e838221546e9329d54a39ba99acb7fc63aa297c7429f30300227f11a0a7d6122498208a7440f18a83b165e4586dbefd7d881b93c231a2
 EBUILD upower-0.9.20-r1.ebuild 2246 SHA256 f2ad81744cb0a19f2dcda4b6937d5287ae539e9139ff33db5436a036a7b08ab9 SHA512 7784955ea4dd90060e3d0851bb0e91831fa402fc36f1814703cc0fd7efaab2314b53f9883c833f852dc05955b0abe8c01dbf21a3181abdb61246ada75afc66cd WHIRLPOOL ff141ae6522135af1854f97737700a1c11835a3e1c126364d92fbe4a545ccbd751d472b5ad192cd99d88a51401c5fe88e01a92b808c84d94900cdc3d54218629
+EBUILD upower-0.9.20-r2.ebuild 2300 SHA256 420eae970a96302549de4cf121ce038fdaa48665b8661dba7cc68ce76e8ed8b5 SHA512 9aacdb5dd6c6f5efa505dbbb504bfcd9459584b737da63a76124fe3a0b77b364a9ed8180062451cb352bcb0f787b0bead09bcf3943fb0edd086044dba57b3209 WHIRLPOOL 66e84134decf8965b7d48ca39b04c71e652ed052d8a1960fde7ff9f0ca62e5820f8d25f4f9f2288c0c7077324565500b3ad2f5dfd5a624189da886652eefd71d
 EBUILD upower-0.9.20.ebuild 2070 SHA256 0f00f3ba4906557f36cc2bfe60224df1095b170b4bc3c4914d8c7dd2e7222f70 SHA512 79030486018bee8be249c528f005c8a5dfe3a031fcae71b42d6f9c20cc7d554877782e20f12f1b32ca0c9f83eb5ce4694c2fb5707607d2d6d3c83e51178332ae WHIRLPOOL 4b3c61b083c78a9b0fddf5553f66428f81a2ded10c0fd6ddbd2ead2e8f14b3da2915dac5ac40492766181a97044f2ca520ecb567cdcb974d36acf5669c9e69bd
-MISC ChangeLog 13387 SHA256 6c1fdee0e68a7dbb8d899d347c20085e9f2ea63ff251a77b6342b1a060654a30 SHA512 36211a271cc9e83d940eb8aaef8d71e36527a1ad99ae730a72ad6f18efedaf0491ac525a27a17c7ae8e0f493da23d9caca1ed8a3ed5026f13887d25d4e6143ae WHIRLPOOL 84f09720ef7417f9388e28b512c604c2197b9a10eb0771d45956f9002329203ae5784b3a7c5d0e958bd9e714d482866f7f63e88b89afdd935e09a266dc35d7ab
+MISC ChangeLog 13636 SHA256 853c842cae92ae403b01c1b2590ae77930dbf029cff419344747455fbd8d1a3b SHA512 6eb66dafee9816fb7d313bc3798371f0980a2503d5dcc25b46350b176f70762fcd037c3604b9c2e9c9d6cc12cd08e5b0d7d5829e8ad03eea59b9a9559605e7f8 WHIRLPOOL f3fe01e8547c90eec758e34504f04fc28596dddc8eddf7cecbe5e7eb180a224efc9117db00eb1c566de6a5ceb189b4d7617590bd9e5f34f8fc7f3a7578bd227e
 MISC metadata.xml 373 SHA256 e5e7b3292fcc941400944f79de0622fc927cd4abe2c81fdfa098c29139ac2a53 SHA512 24597947ff98cb3a1faaf48dc77657f516e5766d20944bddb88096f0001cd3e4c62a5b40e084dbd549fe98e04d6093301ac846437ff392e9a2f45244ede33a5e WHIRLPOOL ed7ed47d42fc899dfa92df93eb2d5e7778d9bfe79f90cc0d500e159b321c27d58ee2be1c53bfec8311d73269ae2e23db0f3b8708decb5ce90b5fc086079a205d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRSdk/AAoJEEdUh39IaPFNb94H/2v7gStNXUMFKGpas4kSeiQI
-3QH+3ZjzwoWWp7DrRdK/DDz9E94a1L2G+dW4ccv+ARoL450ZhTUQz+dctkK8TAgx
-CRY5Js+nRh4OGdOlhS3DVyS0LPnjfee6KlTqkq9FXqnoFheXlqD8109VZVPxTQZl
-C7ozZjkasum9GCE+LYpCRVsFMDckh1SUuPnuiAQcrLYjok705xpRcNXJzBHFbE3j
-I9MOineILTUt/7Z4FRTNHvNkreWayzsRa5oEfgFNoUsJqCJyKfIqdCOjeLW16JKi
-BeO9agJdUbVeh2OC5+XgmLH/tpqKMak2+Rx+eHQts7G2bt0dw4R1lNOpclTltbA=
-=FJXF
+iQEcBAEBCAAGBQJRS0ptAAoJEEdUh39IaPFNs5YH/22q/NOdvHcMt2ltR9CKRtGO
+7q+dPZ6gcys8jotIkgukuQ9WFg6bWYP+/fLUifPdhhYEGpi3SDjssPH2HV06nZAp
+DM+vxU68v9V8CMS7iGp5krhiwWX5ndfTW0g9kNanS/lGb+oRCuTWvU2Za8vFD+VQ
+i/ae25RQjT3vv7y+z/58rjL/n/MSLpw+MY+J1vt8Ow4xqmMIt/1TqMahs+D1wJ7c
+MQQdB1JaJKucMovLOO53fBReZrpzuTA59p3zvRffgT4OfVUEsY2KwuZSBWxPl/Mn
+KgKdXMlG6wGJqnBvFJp4Kz6ZzP7u9qj5+7Aij+TiKToGhvu1wkxUcHwxVfkUJPM=
+=ZGjL
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch b/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch
new file mode 100644
index 000000000000..850e010bc17c
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch
@@ -0,0 +1,30 @@
+From 232d70155c45d24afabe47ed37954cc000678295 Mon Sep 17 00:00:00 2001
+From: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Date: Wed, 20 Mar 2013 16:51:14 +0000
+Subject: Find hidraw devices correctly with systemd udev >= v196.
+
+udev v196 libraries changed behaviour of g_udev_device_get_sysfs_attr()
+by stopping following symlinks for "device" attribute [1]. That change
+broke hiddev finding for unifying devices. Fix that by getting sysfs
+path from parent hiddev device.
+
+1. http://cgit.freedesktop.org/systemd/systemd/commit/?id=5ae18ddc0d86673520c0dd6b59ccac8afc8aa605
+
+Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+diff --git a/src/linux/up-device-unifying.c b/src/linux/up-device-unifying.c
+index c7f0103..4b659c3 100644
+--- a/src/linux/up-device-unifying.c
++++ b/src/linux/up-device-unifying.c
+@@ -165,7 +165,7 @@ up_device_unifying_coldplug (UpDevice *device)
+ 	hidraw_list = g_udev_client_query_by_subsystem (client, "hidraw");
+ 	for (l = hidraw_list; l != NULL; l = l->next) {
+ 		if (g_strcmp0 (g_udev_device_get_sysfs_path (parent),
+-			       g_udev_device_get_sysfs_attr (l->data, "device")) == 0) {
++			       g_udev_device_get_sysfs_path(g_udev_device_get_parent(l->data))) == 0) {
+ 			receiver = g_object_ref (l->data);
+ 			break;
+ 		}
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower/upower-0.9.20-r2.ebuild b/sys-power/upower/upower-0.9.20-r2.ebuild
new file mode 100644
index 000000000000..b1f42a79bd01
--- /dev/null
+++ b/sys-power/upower/upower-0.9.20-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.20-r2.ebuild,v 1.1 2013/03/21 17:59:52 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd udev
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
+HOMEPAGE="http://upower.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+deprecated doc +introspection ios kernel_FreeBSD kernel_linux systemd"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.22
+	sys-apps/dbus
+	>=sys-auth/polkit-0.110
+	introspection? ( dev-libs/gobject-introspection )
+	kernel_linux? (
+		virtual/libusb:1
+		>=virtual/udev-197[gudev]
+		ios? (
+			>=app-pda/libimobiledevice-1
+			>=app-pda/libplist-1
+			)
+		systemd? ( sys-apps/systemd )
+		)"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		deprecated? ( >=sys-power/pm-utils-1.4.1 )
+		systemd? ( app-shells/bash )
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		)"
+REQUIRED_USE="kernel_linux? ( !deprecated? ( systemd ) )"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+src_prepare() {
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+	epatch "${FILESDIR}"/${P}-hidraw_with_udev-196.patch
+}
+
+src_configure() {
+	local backend myconf
+
+	if use kernel_linux; then
+		backend=linux
+		myconf="$(use_enable deprecated)"
+	elif use kernel_FreeBSD; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable introspection) \
+		--disable-static \
+		${myconf} \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable systemd) \
+		--disable-tests \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-backend=${backend} \
+		$(use_with ios idevice) \
+		"$(systemd_with_utildir)" \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" udevrulesdir="$(get_udevdir)"/rules.d install
+
+	dodoc AUTHORS HACKING NEWS README
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}