Version bump. Closes bug #67035.

4 files changed, 117 insertions, 2 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 39f8eac66518..e46cd856e809 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/linuxwacom
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.15 2004/10/04 06:13:29 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.16 2004/10/24 05:47:24 battousai Exp $
+
+*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:
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 5f7da7a478e4..53bea7c5bae0 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,6 +1,8 @@
 MD5 6c722057f7ff9567d0858524fa1e109a ChangeLog 2629
-MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
 MD5 c2f927beefe923be43b483186af5c2d2 linuxwacom-0.6.2.ebuild 3241
 MD5 70ea4ce06ce2c28cd4c3526a20d08c29 linuxwacom-0.6.3.ebuild 3239
+MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
+MD5 70ea4ce06ce2c28cd4c3526a20d08c29 linuxwacom-0.6.4.ebuild 3239
 MD5 270159aa127b9370f0e66f2ccaebd7c7 files/digest-linuxwacom-0.6.2 69
 MD5 78a65c4833619b5ad2df32981808eb6a files/digest-linuxwacom-0.6.3 69
+MD5 845ee9f0e43d25914f1483ce14c7d692 files/digest-linuxwacom-0.6.4 69
diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.4 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.4
new file mode 100644
index 000000000000..a66a8dfa7880
--- /dev/null
+++ b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.4
@@ -0,0 +1 @@
+MD5 2313def6800aa4ad48ddc2029f349dd3 linuxwacom-0.6.4.tar.bz2 433762
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
new file mode 100644
index 000000000000..99c9b0c4db6b
--- /dev/null
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.1 2004/10/24 05:47:24 battousai Exp $
+
+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="x86"
+IUSE="gtk gtk2 tcltk sdk"
+
+RDEPEND="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}
+	sys-devel/libtool
+	dev-util/pkgconfig
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	if use sdk; then
+		if has_version ">=x11-base/xfree-4.3.0-r7"
+		then
+			if [ ! "`grep sdk /var/db/pkg/x11-base/xfree-[0-9]*/USE`" ]
+			then
+				eerror "This package builds against the XFree86 SDK, and therefore requires"
+				eerror "that you have emerged xfree with the sdk USE flag enabled."
+				die "Please remerge xfree with the sdk USE flag enabled."
+			fi
+		elif has_version "x11-base/xorg-x11"
+		then
+			if [ ! "`grep sdk /var/db/pkg/x11-base/xorg-x11-[0-9]*/USE`" ]
+			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
+		else die "This build requires x11-base/xorg-x11 or x11-base/xfree to be installed to build against the SDK when USE=sdk."
+		fi
+		einfo "Building against the X11 SDK. This will install updated X drivers and userland tools."
+	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
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use sdk; then
+		# Simple fixes to configure to check the actual location of the XFree86 SDK
+		# No need to check if just building userland tools
+		cd ${S}
+		sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure
+		sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure
+	fi
+}
+
+src_compile() {
+	if use gtk;
+	then
+		if use gtk2;
+		then
+			withgtk="--with-gtk=2.0"
+		else
+			withgtk="--with-gtk=1.2"
+		fi
+	else
+		withgtk="--with-gtk=no"
+	fi
+	if use tcltk;
+	then
+		withtcltk="--with-tcl --with-tk"
+	else
+		withtcltk="--without-tcl --without-tk"
+	fi
+
+	if use sdk; then
+		myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk"
+		econf ${myconf} || die "configure failed."
+
+		# Makefile fix for build against SDK
+		cd ${S}/src
+		cp Makefile Makefile.orig
+		sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile
+		sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile
+		sed -i -e "s:/include/extensions:/include:g" Makefile
+	else
+		myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk"
+		econf ${myconf} || die "configure failed."
+	fi
+	cd ${S}
+	emake || die "build failed."
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "Install failed."
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+}