Bump to 0.6.6, build fix. Closes bug #76253.

5 files changed, 155 insertions, 13 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 64fdeaa27350..e64f90177bbb 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,14 @@
 # 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.18 2004/11/24 11:40:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.19 2004/12/31 21:40:35 battousai Exp $
+
+*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:
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index f1e09029b9ba..f0b1fca1ac87 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1344503f9308768602037d14525cc97a ChangeLog 3102
+MD5 3923ee217ff9125b1e1080f94c29e874 ChangeLog 3477
 MD5 c2f927beefe923be43b483186af5c2d2 linuxwacom-0.6.2.ebuild 3241
 MD5 70ea4ce06ce2c28cd4c3526a20d08c29 linuxwacom-0.6.3.ebuild 3239
-MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
 MD5 cd33d7feb9a2a2c28aa8d1bbef6f8640 linuxwacom-0.6.4.ebuild 3643
+MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
+MD5 e2e068014e1bce3748d4e9bb13837c00 linuxwacom-0.6.6.ebuild 3654
 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
 MD5 460388794b55a5e57d127858eea80bcc files/linuxwacom-0.6.4-nonx86.patch 1739
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBpHYrArHZZzCEUG0RAgGyAJ9Um7F2DG4JpajQmI39FE5BUx7YqgCfe0dX
-wL45n0Kog611c3Rwdv4+gTg=
-=iEcd
------END PGP SIGNATURE-----
+MD5 97ebb9a35c19c6f15f8fb9ac4b847d09 files/linuxwacom-0.6.6-nonx86.patch 609
+MD5 fe1457589d41bcc4b2407351e6ae2faf files/digest-linuxwacom-0.6.6 69
diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.6 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.6
new file mode 100644
index 000000000000..8addb3ba88cb
--- /dev/null
+++ b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.6
@@ -0,0 +1 @@
+MD5 4328041035dcafac03c429f5d8713aa3 linuxwacom-0.6.6.tar.bz2 466330
diff --git a/x11-misc/linuxwacom/files/linuxwacom-0.6.6-nonx86.patch b/x11-misc/linuxwacom/files/linuxwacom-0.6.6-nonx86.patch
new file mode 100644
index 000000000000..7da6755c14bc
--- /dev/null
+++ b/x11-misc/linuxwacom/files/linuxwacom-0.6.6-nonx86.patch
@@ -0,0 +1,11 @@
+--- linuxwacom-0.6.6/src/Makefile.am.orig	2004-12-31 16:28:47.488608440 -0500
++++ linuxwacom-0.6.6/src/Makefile.am	2004-12-31 16:29:07.690537280 -0500
+@@ -85,7 +85,7 @@
+ 	gcc $(CFLAGS) $(DEPFLAGS) -pipe -ansi \
+ 		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
+ 		-I. $(DRIVER_INCLUDES) \
+-		-Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
++		-Dlinux -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
+ 		-D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE  -D_GNU_SOURCE \
+ 		-DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \
+ 		-DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX \
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
new file mode 100644
index 000000000000..7c22c4d7cc8a
--- /dev/null
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
@@ -0,0 +1,129 @@
+# 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.6.ebuild,v 1.1 2004/12/31 21:40:35 battousai Exp $
+
+IUSE="gtk gtk2 tcltk sdk"
+
+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"
+# Removing ~amd64 until I figure out why xorg-x11-6.8.0 doesn't like it...
+#KEYWORDS="~amd64 x86"
+KEYWORDS="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
+	>=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 x86; then
+		cd ${S}
+		epatch ${FILESDIR}/${P}-nonx86.patch
+
+		export WANT_AUTOMAKE=1.6
+		export WANT_AUTOCONF=2.5
+
+		aclocal
+		autoheader
+		automake -a -c -f
+		autoconf
+	fi
+
+	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/$(get_libdir)/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/$(get_libdir)/Server:" Makefile
+		sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/$(get_libdir)/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}
+	unset ARCH
+	emake || die "build failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed."
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+}