Move linuxwacom to x11-drivers

(Portage version: 2.1.1_pre5-r3)

6 files changed, 445 insertions, 0 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
new file mode 100644
index 000000000000..5d84223b7a12
--- /dev/null
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -0,0 +1,194 @@
+# ChangeLog for x11-misc/linuxwacom
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.1 2006/08/26 02:48:41 hanno Exp $
+
+  02 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild, linuxwacom-0.6.9.ebuild,
+  linuxwacom-0.7.2.ebuild:
+  (#138641) Quote the token for has_version because it contains > (Rodrigo
+  Severo).
+
+  01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild, linuxwacom-0.6.9.ebuild,
+  linuxwacom-0.7.2.ebuild:
+  Apparently the boolean logic was broken for detecting 2.6 headers on 2.4
+  kernels. Reported by wa1ter@myrealbox.com.
+
+  01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.7.2.ebuild:
+  ppc/ppc64 stable.
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild, linuxwacom-0.6.9.ebuild,
+  linuxwacom-0.7.2.ebuild:
+  Only do 2.4 kernel workaround if people are actually not using a 2.6 kernel.
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild, linuxwacom-0.6.9.ebuild,
+  linuxwacom-0.7.2.ebuild:
+  Work around 2.4 kernels by changing from a dep to checking for 2.4
+  linux-headers and USE=usb.
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.7.2.ebuild:
+  x86 stable (Second attempt).
+
+  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  linuxwacom-0.7.2.ebuild:
+  Stable on amd64.
+
+  14 Jun 2006; Jon Hood <squinky86@gentoo.org> linuxwacom-0.7.2.ebuild:
+  Add multilib fixings from Malcomb Lashley <malc@gentoo.org>, #132191.
+
+  15 Feb 2006; Markus Rothe <corsair@gentoo.org> linuxwacom-0.7.2.ebuild:
+  Added ~ppc64
+
+  27 Dec 2005; Bryan Stine <battousai@gentoo.org> linuxwacom-0.6.7.ebuild,
+  linuxwacom-0.6.8.ebuild, linuxwacom-0.6.9.ebuild, linuxwacom-0.7.2.ebuild:
+  Add configure option for building without Xorg SDK. Fixes bug 101674, thanks
+  to Andre Kloth.
+
+*linuxwacom-0.7.2 (27 Dec 2005)
+
+  27 Dec 2005; Bryan Stine <battousai@gentoo.org>
+  -files/linuxwacom-0.6.6-nonx86.patch,
+  +files/linuxwacom-0.7.2-modular-x.patch, -linuxwacom-0.6.6.ebuild,
+  linuxwacom-0.6.9.ebuild, +linuxwacom-0.7.2.ebuild:
+  Version bump to 0.7.2, expunge 0.6.6. With 0.7.2 comes modular Xorg support.
+
+  10 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/linuxwacom-0.6.9-dlloader.patch, linuxwacom-0.6.9.ebuild:
+  Upstream included our dlloader patch but did not bump their version, so if
+  youu get a md5 mismatch, delete the tarball in distfiles and try again.
+
+*linuxwacom-0.6.9 (09 Aug 2005)
+
+  09 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/linuxwacom-0.6.9-dlloader.patch, +linuxwacom-0.6.9.ebuild:
+  Version bump, and handle dlloader properly.  Patch sent upstream.
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> linuxwacom-0.6.8.ebuild:
+  Added to ~ppc.
+
+  22 Jul 2005; Bryan Stine <battousai@gentoo.org>
+  -files/linuxwacom-0.6.4-nonx86.patch, -linuxwacom-0.6.3.ebuild,
+  -linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild,
+  linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild:
+  Add dlloader USE flag, which installs a DSO linuxwacom Xorg driver.
+  Furthermore, conform to Gentoo xorg migration, /usr/X11R6 -> /usr.
+
+*linuxwacom-0.6.8 (07 Jun 2005)
+
+  07 Jun 2005; Bryan Stine <battousai@gentoo.org> linuxwacom-0.6.7.ebuild,
+  +linuxwacom-0.6.8.ebuild:
+  Version bump to 0.6.8. Marked 0.6.7 x86 stable. Closes bug #94912.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  19 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  linuxwacom-0.6.7.ebuild:
+  Require 2.6 headers if we want to use a USB wacom device.  See bug #80992.
+
+*linuxwacom-0.6.7 (18 Apr 2005)
+
+  18 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +linuxwacom-0.6.7.ebuild:
+  Version bump for working amd64 drivers.
+
+  14 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  linuxwacom-0.6.6.ebuild:
+  --enable-xserver64 on amd64.
+
+  08 Feb 2005; Bryan Stine <battousai@gentoo.org> -linuxwacom-0.6.2.ebuild,
+  linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild:
+  Relibtoolize to fix inconsistency with new libtool 1.5.10. Fixes bug #80856.
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild:
+  Works with /usr/libdir xorg-x11 installs now.
+
+*linuxwacom-0.6.6 (31 Dec 2004)
+
+  31 Dec 2004; Bryan Stine <battousai@gentoo.org>
+  +files/linuxwacom-0.6.6-nonx86.patch, +linuxwacom-0.6.6.ebuild:
+  Version bump to 0.6.6. This one needs ARCH unset before emake for the kernel
+  Makefiles, regardless of whether they get built. Thanks to roger (bug
+  #76253) for the update and error report. This closes aforementioned bug.
+
+  24 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  linuxwacom-0.6.4.ebuild:
+  Removing ~amd64 because of some problems I'm seeing with my intuos2 and
+  xorg-x11-6.8.0
+
+  18 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/linuxwacom-0.6.4-nonx86.patch, linuxwacom-0.6.4.ebuild:
+  Added to ~amd64.
+
+*linuxwacom-0.6.4 (24 Oct 2004)
+
+  24 Oct 2004; Bryan Stine <battousai@gentoo.org> +linuxwacom-0.6.4.ebuild:
+  Version bump to 0.6.4. Closes bug #67035.
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.2.ebuild, linuxwacom-0.6.3.ebuild:
+  Update logic to consider that the sdk USE flag may be set without xfree or
+  xorg-x11 installed.
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.2.ebuild, linuxwacom-0.6.3.ebuild:
+  Update dep from temporary hack to virtual/x11.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> linuxwacom-0.6.2.ebuild,
+  linuxwacom-0.6.3.ebuild:
+  add sed-4 dep
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> linuxwacom-0.6.2.ebuild,
+  linuxwacom-0.6.3.ebuild:
+  QA - fix use invocation
+
+  11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.2.ebuild, linuxwacom-0.6.3.ebuild:
+  xfree -r6 became -r7.
+
+  09 Jun 2004; Bryan Stine <battousai@gentoo.org>; linuxwacom-0.6.0.ebuild,
+  linuxwacom-0.6.2.ebuild, linuxwacom-0.6.3.ebuild:
+  Added support for USE=sdk flag. When enabled, it will build the X drivers as
+  it normally did before. When disabled, it will build only the userland tools.
+  This makes the package more flexible for those who wish to keep the stock X
+  driver. Thanks to Scott W. Taylor <swtaylor@gentoo.org> for this concept and
+  related code. Furthermore, linuxwacom-0.6.0 has been clean out.
+
+*linuxwacom-0.6.3 (06 Jun 2004)
+
+  06 Jun 2004; Bryan Stine <battousai@gentoo.org>; linuxwacom-0.6.3.ebuild:
+  Bump to version 0.6.3. Closes #53109, thanks to Lee Trager
+  <nukem@users.xeroprj.org>.
+
+  10 May 2004; Bryan Stine <battousai@gentoo.org>; linuxwacom-0.6.2.ebuild:
+  Got rid of the ? : DEPEND syntax, it's deprecated. Also added a plus to the
+  !gtk2 DEPEND for gtk+-1.2. Thanks to Mr. Bones for the QA.
+
+  10 May 2004; Bryan Stine <battousai@gentoo.org>; linuxwacom-0.6.2.ebuild:
+  Patched ebuild. Also, pedantic spacing fixes. Thanks to Torne Wuff for the
+  added functionality.
+
+*linuxwacom-0.6.2 (10 May 2004)
+
+  10 May 2004; Bryan Stine <battousai@gentoo.org>; linuxwacom-0.6.2.ebuild:
+  Version bump, fixes bug 49862.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.0.ebuild:
+  Missing space in DEPEND.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  linuxwacom-0.6.0.ebuild:
+  Add xorg-x11 to possible.
+
+*linuxwacom-0.6.0 (19 Feb 2004)
+
+  19 Feb 2004; Bryan Stine <battousai@gentoo.org>; linuxwacom-0.6.0.ebuild:
+  Initial import. Builds against the SDK, and replaces the driver distributed
+  with xfree.
+
diff --git a/x11-drivers/linuxwacom/Manifest b/x11-drivers/linuxwacom/Manifest
new file mode 100644
index 000000000000..e0787fdd7845
--- /dev/null
+++ b/x11-drivers/linuxwacom/Manifest
@@ -0,0 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX linuxwacom-0.7.2-modular-x.patch 3139 RMD160 8743a2ec5f9bb0a77c96b370b598325778c0ebb6 SHA1 17eed677f5e68ee97035732860cd0e800faa4daa SHA256 a5614ab425f9a3104f656e12c0e99abc8854ee55b7115369902add654d6dd862
+MD5 f2a560693573941df8d2d80f52121e36 files/linuxwacom-0.7.2-modular-x.patch 3139
+RMD160 8743a2ec5f9bb0a77c96b370b598325778c0ebb6 files/linuxwacom-0.7.2-modular-x.patch 3139
+SHA256 a5614ab425f9a3104f656e12c0e99abc8854ee55b7115369902add654d6dd862 files/linuxwacom-0.7.2-modular-x.patch 3139
+DIST linuxwacom-0.7.2.tar.bz2 781756 RMD160 fa50375d3595f5e968e0bf2482dea4e8d568887c SHA1 e7b9f9a1345972753d851aac5fa8eb86a76a2800 SHA256 639a615d08470168b7da33e2c9f57e35dbee9cfacb739763f5255f62b99dbf1a
+EBUILD linuxwacom-0.7.2.ebuild 3864 RMD160 deab88a9993d42468ce1eff04721f58ad9de298a SHA1 1bfac2d18ba6c117296235f8b76af190a55029ed SHA256 348b7cf562992de546f3532a298546b15e780f58b0cb4ddd666e01d2979260b0
+MD5 8680121c0399de65616784f0fe143443 linuxwacom-0.7.2.ebuild 3864
+RMD160 deab88a9993d42468ce1eff04721f58ad9de298a linuxwacom-0.7.2.ebuild 3864
+SHA256 348b7cf562992de546f3532a298546b15e780f58b0cb4ddd666e01d2979260b0 linuxwacom-0.7.2.ebuild 3864
+MISC ChangeLog 7691 RMD160 9876bb9217a411f1a4fa061096f6eecab8114eec SHA1 e2a9b6a0c123f42efd6e8e00f22d558aeda9c7c7 SHA256 7558b52c96e3f48d19f7016a112f7aa075f7ae9272b42f34438d38efb74b1799
+MD5 7cbba2dbaced71a204353f9c3330441f ChangeLog 7691
+RMD160 9876bb9217a411f1a4fa061096f6eecab8114eec ChangeLog 7691
+SHA256 7558b52c96e3f48d19f7016a112f7aa075f7ae9272b42f34438d38efb74b1799 ChangeLog 7691
+MISC metadata.xml 268 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b SHA1 accbac976c7847c397f73b97e89582008d47b5f9 SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d
+MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
+RMD160 3152329e942d732ece1c03d9e633a92a1012a97b metadata.xml 268
+SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d metadata.xml 268
+MD5 dd86b4a2f3227fed8818eada1545b7b0 files/digest-linuxwacom-0.7.2 253
+RMD160 a5f9b66e4acfbc6e32477027d08bbd7d527bb8a8 files/digest-linuxwacom-0.7.2 253
+SHA256 a79017c36673a3f7d5db1200f5a4a4235ebee16fc29a0855f3f015c3a4eb2a86 files/digest-linuxwacom-0.7.2 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE77Y4r2QksT29OyARAqp7AJ0YAI6bOvwIExvkXT2qV1G6m6GfwgCeO15q
+pxbspRmNwP/Om2sNs+MbDMA=
+=EMBA
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.2 b/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.2
new file mode 100644
index 000000000000..cc889f774754
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.2
@@ -0,0 +1,3 @@
+MD5 3f6290101d5712a24097243ca9f092ed linuxwacom-0.7.2.tar.bz2 781756
+RMD160 fa50375d3595f5e968e0bf2482dea4e8d568887c linuxwacom-0.7.2.tar.bz2 781756
+SHA256 639a615d08470168b7da33e2c9f57e35dbee9cfacb739763f5255f62b99dbf1a linuxwacom-0.7.2.tar.bz2 781756
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch
new file mode 100644
index 000000000000..80a47c43e9e1
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch
@@ -0,0 +1,79 @@
+diff -urN linuxwacom-0.7.2-orig/acinclude.m4 linuxwacom-0.7.2/acinclude.m4
+--- linuxwacom-0.7.2-orig/acinclude.m4	2005-12-27 03:45:09.000000000 -0500
++++ linuxwacom-0.7.2/acinclude.m4	2005-12-27 03:53:28.000000000 -0500
+@@ -227,9 +227,12 @@
+ 			WCM_ENV_XORGSDK=yes
+ 			$WCM_XORGSDK=$WCM_XORGSDK/xc
+ 			AC_MSG_RESULT(ok)
+-		else
++	elif test -f $WCM_XORGSDK/xf86Version.h; then
++		WCM_ENV_XORGSDK=yes
++		AC_MSG_RESULT(ok)
++	else
+ 			AC_MSG_RESULT("xf86Version.h missing")
+-			AC_MSG_RESULT("Tried $WCM_XORGSDK/include and WCM_XORGSDK/xc/include")
++			AC_MSG_RESULT("Tried $WCM_XORGSDK/include and WCM_XORGSDK/xc/include and WCM_XORGSDK")
+ 		fi
+ 		WCM_XORGSDK=`(cd $WCM_XORGSDK; pwd)`
+ 	fi
+@@ -296,11 +299,15 @@
+ dnl handle default case
+ AC_MSG_CHECKING(for X lib directory)
+ if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then
++	WCM_XLIBDIR=$(pkg-config --variable=libdir xorg-server)
+ 	if test -d $WCM_XLIBDIR_DEFAULT/X11 ||
+ 		test -d $WCM_XLIBDIR_DEFAULT; then
+ 		WCM_ENV_XLIB=yes
+ 		WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT
+ 		AC_MSG_RESULT(found)
++	elif test -d $WCM_XLIBDIR/X11; then
++		WCM_ENV_XLIB=yes
++		AC_MSG_RESULT(found)
+ 	else
+ 		AC_MSG_RESULT(not found, tried $WCM_XLIBDIR_DEFAULT/X11)
+ 		WCM_ENV_XLIB=no
+diff -urN linuxwacom-0.7.2-orig/configure.in linuxwacom-0.7.2/configure.in
+--- linuxwacom-0.7.2-orig/configure.in	2005-12-27 03:45:09.000000000 -0500
++++ linuxwacom-0.7.2/configure.in	2005-12-27 03:45:38.000000000 -0500
+@@ -329,6 +329,13 @@
+ AC_ARG_ENABLE(wacomdrv,
+ AC_HELP_STRING([--enable-wacomdrv], [Enable building wacom_drv.{o,so} [[default=yes]]]),
+ 	, enable_wacomdrv=yes)
++PKG_CHECK_MODULES(XORG, [xorg-server xproto], WCM_ENV_XORGSDK=yes, WCM_ENV_XORGSDK=no)
++WCM_XORGSDK=$(pkg-config --variable=sdkdir xorg-server)
++WCM_XORGINC=$(pkg-config --variable=includedir xorg-server)
++WCM_MODULEDIR=$(pkg-config --variable=moduledir xorg-server)
++if test "$WCM_ENV_XORGSDK" == "yes" && test "$enable_wacomdrv" == "yes"; then
++	CFLAGS="${CFLAGS} -I${WCM_XORGSDK} -I${WCM_XORGINC}/X11"
++fi
+ if test "$enable_wacomdrv" != "no"; then
+ 	if test "$WCM_ENV_XF86" != "yes" && test "$WCM_ENV_XORGSDK" != "yes"; then
+ 		echo "***"; echo "*** WARNING:";
+@@ -517,6 +524,7 @@
+ AC_SUBST(WCM_XORGSDK)
+ AC_SUBST(WCM_XF86DIR)
+ AC_SUBST(WCM_XLIBDIR)
++AC_SUBST(WCM_MODULEDIR)
+ AC_SUBST(WCM_XSERVER64)
+ #AC_SUBST(WCM_OPTION_DLLOADER)
+ AC_SUBST(WCM_NO_MERGE_CONSTANTS)
+@@ -565,6 +573,7 @@
+ echo "            XFree86 - $WCM_ENV_XF86 $WCM_XF86DIR"
+ else
+ echo "           Xorg SDK - $WCM_ENV_XORGSDK $WCM_XORGSDK"
++echo "    Xorg Module Dir - $WCM_MODULEDIR"
+ fi
+ echo "          XSERVER64 - $WCM_OPTION_XSERVER64"
+ echo "           dlloader - $WCM_OPTION_DLLOADER"
+diff -urN linuxwacom-0.7.2-orig/src/Makefile.am linuxwacom-0.7.2/src/Makefile.am
+--- linuxwacom-0.7.2-orig/src/Makefile.am	2005-12-27 03:45:09.000000000 -0500
++++ linuxwacom-0.7.2/src/Makefile.am	2005-12-27 03:45:38.000000000 -0500
+@@ -7,7 +7,7 @@
+ wacomcfgdir = $(includedir)/wacomcfg
+ wacomcfg_HEADERS = wacomcfg.h
+ 
+-x86moduledir = @WCM_XLIBDIR@/modules/input
++x86moduledir = @WCM_MODULEDIR@/input
+ x86module_DATA = @WCM_XF86MODULES@
+ 
+ AM_CFLAGS = -Wall -pedantic
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild
new file mode 100644
index 000000000000..1e11d939ddd4
--- /dev/null
+++ b/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild,v 1.1 2006/08/26 02:48:41 hanno Exp $
+
+IUSE="dlloader gtk gtk2 tcltk sdk usb"
+
+inherit multilib eutils linux-info
+
+DESCRIPTION="Input driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="|| ( ( x11-proto/inputproto
+		x11-base/xorg-server )
+	      virtual/x11 )
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2 )
+		!gtk2? ( =x11-libs/gtk+-1.2* )
+	)
+	tcltk? ( dev-lang/tcl dev-lang/tk )
+	sys-libs/ncurses"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	if use sdk || has_version ">=x11-base/xorg-server-0.1" ; then
+		if ! built_with_use x11-base/xorg-x11 sdk && ! has_version ">=x11-base/xorg-server-0.1"
+		then
+			eerror "This package builds against the X.Org SDK, and therefore requires"
+			eerror "that you have emerged xorg-x11 with the sdk USE flag enabled."
+			die "Please remerge xorg-x11 with the sdk USE flag enabled."
+		fi
+		einfo "Installing X Wacom driver and accompanying userland utilities."
+	else
+		ewarn "The 'sdk' use flag is not set. Only building userland tools. If you wish to install"
+		ewarn "the updated external driver for your X server, please remerge your X11 package with"
+		ewarn "the USE=sdk flag enabled."
+	fi
+
+	if use usb; then
+		if ! has_version ">=sys-kernel/linux-headers-2.6"; then
+			if kernel_is 2 6; then
+				local msg
+				msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
+				eerror "$msg"
+				die "$msg"
+			fi
+		fi
+	fi
+}
+
+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
+
+	if use sdk && ! has_version ">=x11-base/xorg-server-0.1" ; then
+		cd ${S}
+
+		# Simple fixes to configure to check the actual location of the XFree86 SDK
+		# No need to check if just building userland tools
+		sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:
+			   s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure
+	fi
+
+	if has_version ">=x11-base/xorg-server-0.1"; then
+		cd ${S}
+		epatch ${FILESDIR}/${P}-modular-x.patch
+	# moved to end of src_unpack to fix multilib issue -Jon <squinky86@gentoo.org>
+	#	autoreconf -v --install
+	#	libtoolize --force --copy
+	fi
+	autoreconf -v --install
+	libtoolize --force --copy
+}
+
+src_compile() {
+	if use gtk; then
+		if use gtk2; then
+			myconf="${myconf} --with-gtk=2.0"
+		else
+			myconf="${myconf} --with-gtk=1.2"
+		fi
+	else
+		myconf="${myconf} --with-gtk=no"
+	fi
+
+	if use tcltk ; then
+		myconf="${myconf} --with-tcl --with-tk"
+	else
+		myconf="${myconf} --without-tcl --without-tk"
+	fi
+
+	if use amd64 ; then
+		myconf="${myconf} --enable-xserver64"
+	fi
+
+	if use sdk || has_version ">=x11-base/xorg-server-0.1" ; then
+		myconf="${myconf} --enable-wacomdrv --enable-wacdump --enable-xsetwacom"
+		has_version ">=x11-base/xorg-server-0.1" || \
+			myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server --with-xlib=/usr/$(get_libdir)"
+
+		if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.1" ; then
+			myconf="${myconf} --enable-dlloader"
+		fi
+
+		econf ${myconf} || die "configure failed."
+
+		# Makefile fix for build against SDK
+		cd ${S}/src
+		sed -i -e "s:/include/extensions:/include:g" Makefile
+	else
+		myconf="${myconf} --disable-wacomdrv --enable-wacdump --enable-xsetwacom --without-xf86-sdk"
+		econf ${myconf} || die "configure failed."
+	fi
+	cd ${S}
+	unset ARCH
+	emake || die "build failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed."
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-drivers/linuxwacom/metadata.xml b/x11-drivers/linuxwacom/metadata.xml
new file mode 100644
index 000000000000..7a4cc64fc14b
--- /dev/null
+++ b/x11-drivers/linuxwacom/metadata.xml
@@ -0,0 +1,6 @@
+<?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>
+</pkgmetadata>