Install "check_driver" to support multiple input devices via udev (bug 209263). Enable compilation for <gcc-4 folks (bug #205139).

Package-Manager: portage-2.1.3.19

5 files changed, 136 insertions, 2 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index 9d0f5121c04f..ec9a5c2e491a 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.17 2008/02/05 11:41:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.18 2008/02/08 21:49:01 rbu Exp $
+
+*linuxwacom-0.7.8_p3-r1 (08 Feb 2008)
+
+  08 Feb 2008; Robert Buchholz <rbu@gentoo.org> +files/check_driver,
+  +files/check_driver.1, +linuxwacom-0.7.8_p3-r1.ebuild:
+  Install "check_driver" to support multiple input devices via udev (bug 209263).
+  Enable compilation for <gcc-4 folks (bug #205139).
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> linuxwacom-0.7.8_p3.ebuild:
   Stable on ppc64
diff --git a/x11-drivers/linuxwacom/Manifest b/x11-drivers/linuxwacom/Manifest
index 999c7cc17e2f..a610527ec6d7 100644
--- a/x11-drivers/linuxwacom/Manifest
+++ b/x11-drivers/linuxwacom/Manifest
@@ -1,9 +1,12 @@
+AUX check_driver 499 RMD160 298507626fa8bb20df0d5d1404002133ef1e4c41 SHA1 12ae37807a03f36be2c5cc47e444475677b41693 SHA256 45331d948e1d37141a56258510d6ff708092f70181e83348eb66eef005878069
+AUX check_driver.1 750 RMD160 9ebe8e30ce2cb83ca3245ba29d19b06e81181651 SHA1 4d6fba491df26709b821184f9e011568eaaaebde SHA256 67bf1469f122830d9e99cbd8762e61f682c9a831577fde29af8ef1ab0440d024
 AUX linuxwacom-0.7.8-pDev.patch 483 RMD160 baae89684fe5abe060ffa358dc21fb48e18c7ab3 SHA1 d2e548febac0cfef42d5021f77bb51cb44842e6a SHA256 207516fdce407efc8d635b143a2774dd9ebbe53565e32e55af6e4a2f22f810dd
 AUX linuxwacom-xorg71.diff 274 RMD160 8c319899ac3f1d9a93d411eb8916bc01da9053ef SHA1 4c3551801e15875efc5d683889fb2323a49b5ec6 SHA256 616deaca0510ffa181b8f6bdf2a8f2d9704a53d9a1c14c5807bcf71836dc4f1c
 AUX xserver-xorg-input-wacom.udev 5716 RMD160 60d36d0bf0e4acf8d5caea34d76db74d8a946d8d SHA1 45f406b7c917a1e8af9994743d4b0626f5f6beb5 SHA256 226805c56b56e4141c33f105204c347b2b68eb6590dc9b5d59c043f49279feb1
 DIST linuxwacom-0.7.4-3.tar.bz2 866312 RMD160 789789803a31eb5b9ff1d35ef760d7d11b5c24dc SHA1 c346485cdaf2bde7ee9d965aca231a4dd55f303e SHA256 0f99153ba1669255e08dd7a730cf33d9766dde43f5b56ec97e6bc8ec63b60260
 DIST linuxwacom-0.7.8-3.tar.bz2 1002452 RMD160 5b6b614dfd2b3de562457676013b4972de1bfa81 SHA1 6bd3d6aa0a4d43a9ea6d1da02c720aa7e694da6a SHA256 ac6a3ab94cf4b306e5823eca33fe84f9b4e8c743201e220a17a3ec4fe3bd3cac
 EBUILD linuxwacom-0.7.4_p3.ebuild 1392 RMD160 321a509fcabb52f220bd584372b7d3cea4594164 SHA1 da76d496bcbd721d71aac40eb03e3c82eff61a6d SHA256 758483d58ad3cfbbb4def09bd30ac0317b4dd7844b2d2edea95f4086b77d99e6
+EBUILD linuxwacom-0.7.8_p3-r1.ebuild 1849 RMD160 fd2131733188e1cb409111dfc29540c03ad4172a SHA1 89b78f981ec829e6845135acab4878e48f1fda1f SHA256 d0d71f0e7fc430e770787ba85620b27554cd24c8c98ffe2adab125232d5b4052
 EBUILD linuxwacom-0.7.8_p3.ebuild 1578 RMD160 f25408e9b94c4951300540b82a596049c68b51a2 SHA1 8a67254c9d432e34a80a02d0631fd2274a5c5def SHA256 c2432c827538a2314987806a3ee4fc796e1aea745991df72b4a353c54e792646
-MISC ChangeLog 9755 RMD160 8940116a98340e56b05f1c8718f6878eaeef9112 SHA1 4b54796cdb9fcdebc7482faeb0f453535116b95c SHA256 a413694e0d97e5563e3e2c000fee622f34e38971a32a05a6295594b159d5230a
+MISC ChangeLog 10052 RMD160 7826cf62e6bd6ab7c6337949f601b8d7fbe83209 SHA1 f5ff345c61ce13a5298e861f0deda1fba31db5ba SHA256 709643cd07cdbb3fbaf96c88effe0b4705103c2047a634afcf336b940b426e1f
 MISC metadata.xml 465 RMD160 0ae8d1818fe7ed1efc78dc18ffd5717aecaebb30 SHA1 328430eab5579d773f8f59a61ce4b7a1b4ad2e73 SHA256 18e26262c4dc919d217a3bedd296dc6d1d2ac2a90338368fa3131c27464f439e
diff --git a/x11-drivers/linuxwacom/files/check_driver b/x11-drivers/linuxwacom/files/check_driver
new file mode 100644
index 000000000000..6e49aa1f1691
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/check_driver
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+
+#logger check_driver called with: $1 - $2 - $3 -
+
+wanted=$1
+devpath=$2
+bustype=$3
+
+device=$(readlink /sys/$devpath/device)
+device=${device##*/}
+driver=$(readlink /sys/$devpath/device/driver)
+driver=${driver##*/}
+
+logger device $device is bound to the $driver driver
+
+if [ "$driver" != "$wanted" ]; then
+    logger must rebind
+    echo -n "$device" > /sys/$devpath/device/driver/unbind
+    echo -n "$device" > /sys/bus/$bustype/drivers/$wanted/bind
+else
+    logger no need to rebind
+fi
+
diff --git a/x11-drivers/linuxwacom/files/check_driver.1 b/x11-drivers/linuxwacom/files/check_driver.1
new file mode 100644
index 000000000000..cf3a5f9e43e2
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/check_driver.1
@@ -0,0 +1,22 @@
+.TH wacom\-tools 1 "5 Nov 2004" "Debian GNU/Linux" "Debian"
+.SH NAME
+check_driver \- Linux 2.6(.16+) userspace device rebinding helper.
+
+.SH SYNOPSIS
+.B check_driver driver devpath bustype
+
+.SH DESCRIPTION
+This is a \fBRUN\fP script that may be invoked from a udev rule to ensure the
+correct driver is bound to a particular device, in situations where a
+basic driver may bind to it first but a more specialised one is available.
+
+.SH EXAMPLE
+For the wacom device, a rule like this is used:
+
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", ACTION=="add", RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}"
+
+.SH COPYRIGHT
+2006, Ron Lee <ron@debian.org>.  Created for the Debian GNU/Linux
+distribution.  It may be freely distributed elsewhere.
+
+
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3-r1.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3-r1.ebuild
new file mode 100644
index 000000000000..2382a3c5e420
--- /dev/null
+++ b/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3-r1.ebuild,v 1.1 2008/02/08 21:49:01 rbu Exp $
+
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="Input driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tar.bz2"
+
+IUSE="gtk tcl tk usb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="|| ( ( x11-proto/inputproto
+		x11-base/xorg-server )
+		  virtual/x11 )
+	media-libs/libpixman
+	gtk? ( >=x11-libs/gtk+-2 )
+	tcl? ( dev-lang/tcl )
+	tk?  ( dev-lang/tk )
+	sys-fs/udev
+	sys-libs/ncurses"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )"
+S=${WORKDIR}/${P/_p/-}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix multilib-strict error for Tcl/Tk library install
+	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
+
+	# Remove warning parameters for gcc < 4, bug 205139
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am
+	fi
+
+	epatch "${FILESDIR}"/${P%_p*}-pDev.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	if use gtk; then
+		myconf="--with-gtk=2.0"
+	else
+		myconf="--with-gtk=no"
+	fi
+
+	econf ${myconf} \
+		$(use_with tcl tcl) \
+		$(use_with tk tk) \
+		--enable-wacomdrv --enable-wacdump \
+		--enable-xsetwacom --enable-dlloader || die "econf failed"
+
+	unset ARCH
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed."
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/xserver-xorg-input-wacom.udev 60-wacom.rules
+
+	exeinto /lib/udev/
+	doexe "${FILESDIR}"/check_driver
+	doman "${FILESDIR}"/check_driver.1
+
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+}