Version bump (bug #147537)

(Portage version: 2.1.3.19)

7 files changed, 172 insertions, 6 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index 0c653ac87652..985d42afc216 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.11 2007/07/22 02:37:30 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.12 2007/12/30 16:09:28 rbu Exp $
+
+*linuxwacom-0.7.8_p3 (30 Dec 2007)
+
+  30 Dec 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/linuxwacom-0.7.8-pDev.patch, +files/xserver-xorg-input-wacom.udev,
+  metadata.xml, linuxwacom-0.7.4_p3.ebuild, +linuxwacom-0.7.8_p3.ebuild:
+  Version bump (bug #147537). Thanks to all the people on the bug!
+  Adding myself and ikelos as maintainer.
+  Install udev rules for tablets, see NEWS file for more.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   linuxwacom-0.7.4_p3.ebuild:
diff --git a/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.8_p3 b/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.8_p3
new file mode 100644
index 000000000000..8542516c2ef2
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.8_p3
@@ -0,0 +1,3 @@
+MD5 19214c30e68114bb2101a287b11b8f32 linuxwacom-0.7.8-3.tar.bz2 1002452
+RMD160 5b6b614dfd2b3de562457676013b4972de1bfa81 linuxwacom-0.7.8-3.tar.bz2 1002452
+SHA256 ac6a3ab94cf4b306e5823eca33fe84f9b4e8c743201e220a17a3ec4fe3bd3cac linuxwacom-0.7.8-3.tar.bz2 1002452
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.7.8-pDev.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.7.8-pDev.patch
new file mode 100644
index 000000000000..9591e4e48902
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/linuxwacom-0.7.8-pDev.patch
@@ -0,0 +1,12 @@
+diff -Naur tmp-old/src/xdrv/wcmCommon.c tmp-new/src/xdrv/wcmCommon.c
+--- src/xdrv/wcmCommon.c	2007-09-16 19:57:42.000000000 +0000
++++ src/xdrv/wcmCommon.c	2007-09-16 20:39:26.000000000 +0000
+@@ -1096,7 +1096,7 @@
+ #if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ 	if (!miPointerCurrentScreen())
+ #else
+-	if (!miPointerGetScreen(pDev->dev))
++	if (!miPointerGetScreen(common->wcmDevices->local->dev))
+ #endif
+ 	{
+ 		DBG(1, common->debugLevel, ErrorF("xf86WcmEvent: "
diff --git a/x11-drivers/linuxwacom/files/xserver-xorg-input-wacom.udev b/x11-drivers/linuxwacom/files/xserver-xorg-input-wacom.udev
new file mode 100644
index 000000000000..0d5ac0814d04
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/xserver-xorg-input-wacom.udev
@@ -0,0 +1,66 @@
+# udev rules for wacom tablets.
+# These rules were compiled for the Debian GNU/Linux distribution,
+# but others may, and indeed are encouraged to, use them also.
+#
+# Should you do so, PLEASE CO-ORDINATE ANY CHANGES OR ADDITIONS
+# of new devices with Ron <ron@debian.org> so that we can try
+# to present users with with a standard set of device nodes
+# which they can rely on across the board.
+
+# Convenience link for the common case of a single tablet.
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYMLINK="input/wacom"
+
+# Type-named links for multiple tablets.  If you want to use multiple
+# tablets of the _same_ type, you will probably need to use the links
+# from /dev/input/by-path to identify which is plugged into what usb
+# port.  For different types though, just pick your links from the
+# list below.
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0000", SYMLINK+="input/tablet-penpartner"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0010", SYMLINK+="input/tablet-graphire"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0011", SYMLINK+="input/tablet-graphire2-4x5"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0012", SYMLINK+="input/tablet-graphire2-5x7"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0013", SYMLINK+="input/tablet-graphire3"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0014", SYMLINK+="input/tablet-graphire3-6x8"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0015", SYMLINK+="input/tablet-graphire4-4x5"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0016", SYMLINK+="input/tablet-graphire4-6x8"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0060", SYMLINK+="input/tablet-volito"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0061", SYMLINK+="input/tablet-penstation2"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0062", SYMLINK+="input/tablet-volito2-4x5"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0063", SYMLINK+="input/tablet-volito2-2x3"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0064", SYMLINK+="input/tablet-penpartner2"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0020", SYMLINK+="input/tablet-intuos-4x5"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0021", SYMLINK+="input/tablet-intuos-6x8"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0022", SYMLINK+="input/tablet-intuos-9x12"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0023", SYMLINK+="input/tablet-intuos-12x12"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0024", SYMLINK+="input/tablet-intuos-12x18"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0030", SYMLINK+="input/tablet-pl400"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0031", SYMLINK+="input/tablet-pl500"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0032", SYMLINK+="input/tablet-pl600"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0033", SYMLINK+="input/tablet-pl600sx"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0034", SYMLINK+="input/tablet-pl550"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0035", SYMLINK+="input/tablet-pl800"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0037", SYMLINK+="input/tablet-pl700"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0038", SYMLINK+="input/tablet-pl510"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0039", SYMLINK+="input/tablet-dtu710"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00C0", SYMLINK+="input/tablet-dtf521"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00C4", SYMLINK+="input/tablet-dtf720"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0003", SYMLINK+="input/tablet-cintiq_partner"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0041", SYMLINK+="input/tablet-intuos2-4x5"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0042", SYMLINK+="input/tablet-intuos2-6x8"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0043", SYMLINK+="input/tablet-intuos2-9x12"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0044", SYMLINK+="input/tablet-intuos2-12x12"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0045", SYMLINK+="input/tablet-intuos2-12x18"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B0", SYMLINK+="input/tablet-intuos3-4x5"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B1", SYMLINK+="input/tablet-intuos3-6x8"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B2", SYMLINK+="input/tablet-intuos3-9x12"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B3", SYMLINK+="input/tablet-intuos3-12x12"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B4", SYMLINK+="input/tablet-intuos3-12x19"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B5", SYMLINK+="input/tablet-intuos3-6x11"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="003F", SYMLINK+="input/tablet-cintiq21ux"
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0047", SYMLINK+="input/tablet-intuos2-6x8a"
+
+# Check and repossess the device if a module other than the wacom one
+# is already bound to it.
+
+KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", ACTION=="add", RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}"
+
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
index ca7166047f59..a4891b0e2472 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.9 2007/07/22 02:37:30 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.10 2007/12/30 16:09:28 rbu Exp $
 
 IUSE="gtk tcl tk usb"
 
@@ -28,8 +28,8 @@ S=${WORKDIR}/${P/_p/-}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/linuxwacom-xorg71.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/linuxwacom-xorg71.diff
 
 	# Fix multilib-strict error for Tcl/Tk library install
 	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3.ebuild
new file mode 100644
index 000000000000..c0a2a94df8b6
--- /dev/null
+++ b/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/12/30 16:09:28 rbu Exp $
+
+inherit eutils autotools
+
+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 )
+	tcltk? ( dev-lang/tcl 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
+
+	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
+
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-drivers/linuxwacom/metadata.xml b/x11-drivers/linuxwacom/metadata.xml
index c7f90a022ff5..dbbdf0d8ebe7 100644
--- a/x11-drivers/linuxwacom/metadata.xml
+++ b/x11-drivers/linuxwacom/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11-drivers</herd>
-<longdescription>linuxwacom is an open-source XFree86 input driver for Wacom tablets.</longdescription>
+  <herd>x11-drivers</herd>
+  <maintainer>
+    <email>rbu@gentoo.org</email>
+    <name>Robert Buchholz</name>
+  </maintainer>
+  <maintainer>
+    <email>ikelos@gentoo.org</email>
+    <name>Mike Auty</name>
+  </maintainer>
+  <longdescription>linuxwacom is an open-source XFree86 input driver for Wacom tablets.</longdescription>
 </pkgmetadata>