Version bump to 0.6.8. Marked 0.6.7 x86 stable. Closes bug #94912.

(Portage version: 2.0.51.22-r1)

5 files changed, 136 insertions, 7 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 6b534df2e7d1..0c6da5242c5d 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/linuxwacom
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.27 2005/04/25 06:12:52 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.28 2005/06/07 23:34:34 battousai Exp $
+
+*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.
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 3ab3f4cca12d..cc5ed0f7e3c8 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,12 +1,14 @@
 MD5 023a0fa44995cdd0ed38287ad2f72d1d ChangeLog 4382
 MD5 a9e75705cd68f2ac78676624c583cb48 linuxwacom-0.6.3.ebuild 3240
 MD5 97b48494a961baa4d4dacea03dbcc6b6 linuxwacom-0.6.4.ebuild 3901
-MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
 MD5 0d20049d7ac0598683dc588cead5b09a linuxwacom-0.6.6.ebuild 3812
-MD5 21979261456a2eae981192f67571d517 linuxwacom-0.6.7.ebuild 3564
-MD5 c63cfe07a0a7457ddc796feee5501b6a files/digest-linuxwacom-0.6.7 69
+MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
+MD5 d97899d3ddd4c6d79d411eb43e8f6f9f linuxwacom-0.6.7.ebuild 3563
+MD5 21979261456a2eae981192f67571d517 linuxwacom-0.6.8.ebuild 3564
 MD5 78a65c4833619b5ad2df32981808eb6a files/digest-linuxwacom-0.6.3 69
 MD5 845ee9f0e43d25914f1483ce14c7d692 files/digest-linuxwacom-0.6.4 69
-MD5 460388794b55a5e57d127858eea80bcc files/linuxwacom-0.6.4-nonx86.patch 1739
 MD5 fe1457589d41bcc4b2407351e6ae2faf files/digest-linuxwacom-0.6.6 69
+MD5 460388794b55a5e57d127858eea80bcc files/linuxwacom-0.6.4-nonx86.patch 1739
 MD5 97ebb9a35c19c6f15f8fb9ac4b847d09 files/linuxwacom-0.6.6-nonx86.patch 609
+MD5 c63cfe07a0a7457ddc796feee5501b6a files/digest-linuxwacom-0.6.7 69
+MD5 5cad69052ceddf84cea16c74fef9b805 files/digest-linuxwacom-0.6.8 69
diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.8 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.8
new file mode 100644
index 000000000000..d08edc68ebb3
--- /dev/null
+++ b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.8
@@ -0,0 +1 @@
+MD5 31e89a81b4f959bd9ab13ffba1db8612 linuxwacom-0.6.8.tar.bz2 496784
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
index 4ec5ece8ae7d..0569c8cbf7b4 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild,v 1.2 2005/04/19 17:46:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild,v 1.3 2005/06/07 23:34:34 battousai Exp $
 
 IUSE="gtk gtk2 tcltk sdk usb"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="virtual/x11
 	gtk? (
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
new file mode 100644
index 000000000000..2f7559c2fd57
--- /dev/null
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild,v 1.1 2005/06/07 23:34:34 battousai Exp $
+
+IUSE="gtk gtk2 tcltk sdk usb"
+
+inherit eutils
+
+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 ~x86"
+
+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
+	!x86? ( >=sys-devel/automake-1.6
+	        >=sys-devel/autoconf-2.53 )
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )
+	>=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
+			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; then
+		myconf="${myconf} --enable-wacomdrv --enable-wacdump --enable-xsetwacom"
+		if [ -f "/usr/$(get_libdir)/Server/include/xf86Version.h" ]; then
+			myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server"
+		else
+			myconf="${myconf} --with-xf86=/usr/X11R6/$(get_libdir)/Server --with-xorg-sdk=/usr/X11R6/$(get_libdir)/Server"
+		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"
+		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
+}