Version bump for bug #416363, thanks to Christoph Brill (egore). Now properly installs udev rules.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 145 insertions, 2 deletions

diff --git a/dev-libs/libwacom/ChangeLog b/dev-libs/libwacom/ChangeLog
index b21dcda54a09..e1a81e247bc5 100644
--- a/dev-libs/libwacom/ChangeLog
+++ b/dev-libs/libwacom/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libwacom
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/ChangeLog,v 1.2 2012/05/04 18:35:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/ChangeLog,v 1.3 2012/05/19 08:43:58 tetromino Exp $
+
+*libwacom-0.5 (19 May 2012)
+
+  19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libwacom-0.5.ebuild, +files/libwacom-0.5-eraser.patch,
+  +files/libwacom-0.5-eraser-bamboo.patch:
+  Version bump for bug #416363, thanks to Christoph Brill (egore). Now properly
+  installs udev rules.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> libwacom-0.4.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index b013053bd495..feba90f57db9 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,4 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libwacom-0.5-eraser-bamboo.patch 1124 RMD160 b6b38c33cab5986d1b8d5f4ebc0767ec749e2752 SHA1 fbacbb69b6f6dd0b55b212f2ab01edf9dfa371ce SHA256 be5d45b2c907ed835f562aace55841bc2a6e237672a729923c548d8c09ea2f10
+AUX libwacom-0.5-eraser.patch 1156 RMD160 79f798fc6767c5a15af1259d604d3d4166e9a0c6 SHA1 31f0bd71ac7b5d406d6e952b62750f6ccde1ad55 SHA256 39779e86c6145764f837ef173e7cbe646d199aebfee66d55f6bd36645471fd55
 DIST libwacom-0.4.tar.xz 238476 RMD160 b27b435f0d2d4ada8cd397a6922dad50bfa650c8 SHA1 eb26a655830fc31667ce08c395fd41c693474b1b SHA256 13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367
+DIST libwacom-0.5.tar.bz2 371749 RMD160 96c391b527e4eb6b21c0f051143f387bd88078ed SHA1 563df6f9c32153c66daa6883c57ede3ce263f8b6 SHA256 62e38476305ba8c998071e77feaa4ec7b8a5ab08b6b483c35f1a4dca8a6b7ede
 EBUILD libwacom-0.4.ebuild 874 RMD160 1810b5bf432b114084ad073790558dba53a1f11d SHA1 f84530533d54c5cb31237521f2a814c4f87112fd SHA256 05fbe47a538bb0c6515dfdd4396c4d0b65a835a70bf6d38377d0e0e03ddd730c
-MISC ChangeLog 531 RMD160 4337216979d6903605fd88a0a8a36d5f4eb1a385 SHA1 b0bf498f29d4bf327b2be6be8d72c343b892da90 SHA256 940c9e54db4ca8a9d0adb82ddff3e319be69a9d5fb9773ab6247d295571a55b2
+EBUILD libwacom-0.5.ebuild 1282 RMD160 61c41e6626ba3850a61a993a7d1134c0c5aab339 SHA1 573cb2c19aaf1471f1af2d0c79c0fa2e5cac6068 SHA256 70dbd343c57463d5f06fa4bfec11d972ab52dc94c4572a8eefd0275f653ce5ca
+MISC ChangeLog 827 RMD160 51d012631f0f2d1846cb30529d02338999af30fd SHA1 f1c7e23e50b8e9b93fbfaabe96f8a4db80357f5f SHA256 550ae9f89e39a78cfb8bf87b8881aa37e29a933b3760c42614a9e7e76fc35520
 MISC metadata.xml 235 RMD160 2b622eaee2f1b2f24614266e8e78bfb92a73b7bd SHA1 e0b0a496d62ad809efd1eb23df0a12e30e5598f0 SHA256 90059f50c905d3fedb940d40badfa498daf5ea7af7f9586df10cd00c59c71678
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPt11TAAoJEJ0WA1zPCt1hlCsIAJ2Ub2ypi4teaJpmcaK3a9uM
+GfU7TM1wvNBewHroyR8GxpQCVnmd4qpXAnR65lJGeaS0kqIooGUQ5Iqq/QXVOna3
+Il5n5cYA4bhUdEuupXScJ8kFG7xRs1xov4tizOKn675vjYMAlOPymw28JRuuMqXr
+W8C3lFQfiiO1cdNfflkYq57K0frqAghTXSvJX/+//SzeTajFW5wMDPH3klxuF9lU
+7uDh6oYKqw+mACf1GCBwMOEN0xcqH7oP3ZAGqKfTSz5WitTn8CRsOJj3KgUY5hIs
+qK9n4LtlwVyowFPitLoc/RUcRhldno0iWbgEMKO61Tf+89umQ3Qkom8QrmlxRBg=
+=6P6b
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch b/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch
new file mode 100644
index 000000000000..25f722e57878
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch
@@ -0,0 +1,35 @@
+From f2845accd942e44238edf030f6bd918f9d88838e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 3 May 2012 09:24:32 +1000
+Subject: [PATCH] data: add generic eraser to Bamboo Pen & Touch
+
+Crashes gnome-control-center without it.
+
+(gnome-control-center:18115): wacom-cc-panel-WARNING **: Could not set the
+current stylus ID 0x0 for tablet 'Wacom Bamboo Pen & Touch', no general pen
+found
+wacom-cc-panel:ERROR:gsd-wacom-device.c:1491:gsd_wacom_device_set_current_stylus:
+assertion failed: (device->priv->styli)
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Ping Cheng <pinglinux@gmail.com>
+---
+ data/bamboo-pen-and-touch.tablet |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/bamboo-pen-and-touch.tablet b/data/bamboo-pen-and-touch.tablet
+index 125db37..3fff338 100644
+--- a/data/bamboo-pen-and-touch.tablet
++++ b/data/bamboo-pen-and-touch.tablet
+@@ -13,7 +13,7 @@ Width=6
+ Height=4
+ 
+ # The other stylusses don't match it, it has two buttons and an eraser.
+-Styli=0xfffff
++Styli=0xfffff;0xffffe;
+ 
+ [Features]
+ Stylus=true
+-- 
+1.7.8.6
+
diff --git a/dev-libs/libwacom/files/libwacom-0.5-eraser.patch b/dev-libs/libwacom/files/libwacom-0.5-eraser.patch
new file mode 100644
index 000000000000..2e0791eb089d
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-0.5-eraser.patch
@@ -0,0 +1,34 @@
+From 17eb272e0cc6dd8404d210770ab9c2c0c9624a09 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 2 May 2012 16:57:04 +0100
+Subject: [PATCH] lib: Fix generic stylus missing an eraser
+
+HasEraser=yes, but we didn't add an eraser for the stylus,
+leading to bugs in the display UI for consumer products.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675299
+---
+ libwacom/libwacom-database.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
+index 0c60d6d..9fc9e35 100644
+--- a/libwacom/libwacom-database.c
++++ b/libwacom/libwacom-database.c
+@@ -369,9 +369,10 @@ libwacom_parse_tablet_keyfile(const char *path)
+ 		g_strfreev (styli_list);
+ 		device->supported_styli = (int *) g_array_free (array, FALSE);
+ 	} else {
+-		device->supported_styli = g_new (int, 1);
+-		*device->supported_styli = 0xfffff;
+-		device->num_styli = 1;
++		device->supported_styli = g_new (int, 2);
++		device->supported_styli[0] = WACOM_STYLUS_FALLBACK_ID;
++		device->supported_styli[1] = WACOM_ERASER_FALLBACK_ID;
++		device->num_styli = 2;
+ 	}
+ 
+ 	/* Features */
+-- 
+1.7.8.6
+
diff --git a/dev-libs/libwacom/libwacom-0.5.ebuild b/dev-libs/libwacom/libwacom-0.5.ebuild
new file mode 100644
index 000000000000..60866c057151
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-0.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.5.ebuild,v 1.1 2012/05/19 08:43:58 tetromino Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="dev-libs/glib:2
+	sys-fs/udev[gudev]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# in next release
+	epatch "${FILESDIR}/${P}-eraser.patch"
+	epatch "${FILESDIR}/${P}-eraser-bamboo.patch"
+
+	if ! use doc; then
+		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die "sed failed"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodir /lib/udev/rules.d
+	# generate-udev-rules must be run from inside tools directory
+	pushd tools > /dev/null
+	./generate-udev-rules > "${ED}/lib/udev/rules.d/65-libwacom.rules" ||
+		die "generating udev rules failed"
+	popd > /dev/null
+	use doc && dohtml -r doc/html/*
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+}