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.

(Portage version: 2.0.51.22-r2)

4 files changed, 9 insertions, 164 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 9a5919689abe..86f541a4cebe 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2005/08/09 00:48:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.32 2005/08/10 19:20:54 eradicator Exp $
+
+  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)
 
diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.9 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.9
index 348990fcb020..9e2d140a23b3 100644
--- a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.9
+++ b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.9
@@ -1 +1 @@
-MD5 0407d0869f41a3eae963bcd316c697c9 linuxwacom-0.6.9.tar.bz2 475573
+MD5 df54f423002cfb19aaa822c7f5adf49c linuxwacom-0.6.9.tar.bz2 475547
diff --git a/x11-misc/linuxwacom/files/linuxwacom-0.6.9-dlloader.patch b/x11-misc/linuxwacom/files/linuxwacom-0.6.9-dlloader.patch
deleted file mode 100644
index d69f9800e54f..000000000000
--- a/x11-misc/linuxwacom/files/linuxwacom-0.6.9-dlloader.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- linuxwacom-0.6.9/configure.in.orig	2005-08-08 17:40:18.000000000 -0700
-+++ linuxwacom-0.6.9/configure.in	2005-08-08 17:40:20.000000000 -0700
-@@ -293,10 +293,21 @@ if test "$enable_tabletdev" != "no"; the
- 	fi
- fi
- 
-+dnl Check for dlloader
-+WCM_OPTION_DLLOADER=no
-+AC_ARG_ENABLE(dlloader,
-+AC_HELP_STRING([--enable-dlloader], [Use dlloader  [[default=no]]]),
-+	, enable_dlloader=no)
-+if test "$enable_dlloader" != "no"; then
-+	WCM_OPTION_DLLOADER=yes
-+fi
-+
-+AM_CONDITIONAL(WCM_DLLOADER, test "$WCM_OPTION_DLLOADER" == "yes")
-+
- dnl Check for wacomdrv build
- WCM_OPTION_WACOMDRV=no
- AC_ARG_ENABLE(wacomdrv,
--AC_HELP_STRING([--enable-wacomdrv], [Enable building wacom_drv.o [[default=yes]]]),
-+AC_HELP_STRING([--enable-wacomdrv], [Enable building wacom_drv.{o,so} [[default=yes]]]),
- 	, enable_wacomdrv=yes)
- if test "$enable_wacomdrv" != "no"; then
- 	if test "$WCM_ENV_XF86" != "yes" && test "$WCM_ENV_XORGSDK" != "yes"; then
-@@ -307,8 +318,14 @@ if test "$enable_wacomdrv" != "no"; then
- 		echo "***"
- 	else
- 		WCM_OPTION_WACOMDRV=yes
--		WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.o"
--		WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.o"
-+
-+		if test "$WCM_OPTION_DLLOADER" == "yes" ; then
-+			WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.so"
-+			WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.so"
-+		else
-+			WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.o"
-+			WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.o"
-+		fi
- 	fi
- fi
- 
-@@ -334,18 +351,6 @@ if test "$enable_xserver64" != "no"; the
- 	fi
- fi
- 
--dnl Check for dlloader
--WCM_OPTION_DLLOADER=no
--AC_ARG_ENABLE(dlloader,
--AC_HELP_STRING([--enable-dlloader], [Use dlloader  [[default=no]]]),
--	, enable_dlloader=no)
--if test "$enable_dlloader" != "no"; then
--	CFLAGS="$CFLAGS -fPIC"
--	WCM_OPTION_DLLOADER=yes
--fi
--
--AM_CONDITIONAL(WCM_DLLOADER, test "$WCM_OPTION_DLLOADER" == "yes")
--
- dnl Check for modver
- AC_ARG_ENABLE(modver,
- AC_HELP_STRING([--enable-modver], [Enable kernel module versioning [[default=usually]]]),
-@@ -552,7 +557,13 @@ echo "            evdev.o - $WCM_OPTION_
- echo "         mousedev.o - $WCM_OPTION_MOUSEDEV"
- echo "            input.o - $WCM_OPTION_INPUT"
- echo "        tabletdev.o - $WCM_OPTION_TABLETDEV"
-+if test "$WCM_OPTION_DLLOADER" == "yes" ; then
-+echo "        wacom_drv.so - $WCM_OPTION_WACOMDRV $WCM_PATCH_WACOMDRV"
-+echo "        wacom_drv.o - no"
-+else
-+echo "        wacom_drv.so - no"
- echo "        wacom_drv.o - $WCM_OPTION_WACOMDRV $WCM_PATCH_WACOMDRV"
-+fi
- echo "----------------------------------------"
- 
- dnl Check for x86_64 kernel
---- linuxwacom-0.6.9/src/Makefile.am.orig	2005-08-08 17:42:34.000000000 -0700
-+++ linuxwacom-0.6.9/src/Makefile.am	2005-08-08 17:43:51.000000000 -0700
-@@ -17,7 +17,7 @@ DEPFLAGS = @WCM_DEPFLAGS@
- # potentially be built or installed depending on the results of
- # the configuration.
- EXTRA_PROGRAMS = wacdump xidump xsetwacom 
--EXTRA_SCRIPTS = wacom_drv.o wacomcpl wacomcpl-exec
-+EXTRA_SCRIPTS = wacom_drv.o wacom_drv.so wacomcpl wacomcpl-exec
- 
- # Source dependencies
- wacdump_SOURCES = wacdump.c wacscrn.c wacscrn.h \
-@@ -75,17 +75,27 @@ LINUX_INPUT=@WCM_LINUX_INPUT@
- XF86OBJS = xf86Wacom.o wcmSerial.o wcmUSB.o wcmISDV4.o \
- 		wcmCommon.o wcmCompat.o wcmConfig.o wcmFilter.o
- 
-+XF86OBJS_PIC = $(XF86OBJS:.o=.lo)
-+
- xf86Wacom.o: xf86Wacom.c xf86Wacom.h Makefile
-+xf86Wacom.lo: xf86Wacom.c xf86Wacom.h Makefile
- wcmSerial.o: wcmSerial.c wcmSerial.h xf86Wacom.h
-+wcmSerial.lo: wcmSerial.c wcmSerial.h xf86Wacom.h
- wcmISDV4.o: wcmISDV4.c wcmSerial.h xf86Wacom.h
-+wcmISDV4.lo: wcmISDV4.c wcmSerial.h xf86Wacom.h
- wcmUSB.o: wcmUSB.c xf86Wacom.h
-+wcmUSB.lo: wcmUSB.c xf86Wacom.h
- wcmCommon.o: wcmCommon.c xf86Wacom.h
-+wcmCommon.lo: wcmCommon.c xf86Wacom.h
- wcmCompat.o: wcmCompat.c xf86Wacom.h
-+wcmCompat.lo: wcmCompat.c xf86Wacom.h
- wcmConfig.o: wcmConfig.c xf86Wacom.h
-+wcmConfig.lo: wcmConfig.c xf86Wacom.h
- wcmFilter.o: wcmFilter.c xf86Wacom.h
-+wcmFilter.lo: wcmFilter.c xf86Wacom.h
- 
- $(XF86OBJS): xf86Wacom.c Makefile
--	gcc $(CFLAGS) $(DEPFLAGS) -pipe -ansi \
-+	$(CC) $(CFLAGS) $(DEPFLAGS) -pipe -ansi \
- 		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
- 		-I.  $(DRIVER_INCLUDES) -Dlinux \
- 		-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
-@@ -101,9 +111,25 @@ $(XF86OBJS): xf86Wacom.c Makefile
- 		-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
- 		-o $@ -c $(subst .o,.c,$@)
- 
--wacom_drv.o: $(XF86OBJS)
--	ld -r $(XF86OBJS) -o wacom_drv.o
-+$(XF86OBJS_PIC): xf86Wacom.c Makefile 
-+	$(CC) $(CFLAGS) $(DEPFLAGS) -fPIC -pipe -ansi \
-+		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
-+		-I.  $(DRIVER_INCLUDES) -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 \
-+		-DRENDER -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV \
-+		-DSINGLEDEPTH -DXFreeXDGA -DXvExtension -DXFree86LOADER \
-+		-DXFree86Server -DXF86VIDMODE -DXvMCExtension \
-+		-DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \
-+		-DX_BYTE_ORDER=X_LITTLE_ENDIAN $(XSERVER64) \
-+		-DNDEBUG -DFUNCPROTO=15 \
-+		-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
-+		-o $@ -c $(subst .lo,.c,$@)
- 
--if WCM_DLLOADER
--	gcc -fPIC -shared -nostdlib -o wacom_drv.so wacom_drv.o -Bstatic -lgcc
--endif
-+wacom_drv.so: $(XF86OBJS_PIC)
-+	$(CC) -shared -nostdlib -o wacom_drv.so $(XF86OBJS_PIC) -Bstatic -lgcc
-+
-+wacom_drv.o: $(XF86OBJS)
-+	$(LD) -r $(XF86OBJS) -o wacom_drv.o
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
index 09cd8dd748ec..28be997884e1 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
@@ -1,10 +1,10 @@
 # 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.9.ebuild,v 1.2 2005/08/09 01:58:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild,v 1.3 2005/08/10 19:20:54 eradicator Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
-inherit eutils toolchain-funcs
+inherit multilib eutils
 
 DESCRIPTION="Input driver for Wacom tablets and drawing devices"
 HOMEPAGE="http://linuxwacom.sourceforge.net/"
@@ -23,9 +23,6 @@ RDEPEND="virtual/x11
 	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
-	sdk? ( sys-devel/libtool
-	       =sys-devel/automake-1.6*
-	       >=sys-devel/autoconf-2.57 )
 	dev-util/pkgconfig
 	usb? ( >=sys-kernel/linux-headers-2.6 )
 	>=sys-apps/sed-4"
@@ -52,17 +49,6 @@ src_unpack() {
 	if use sdk; then
 		cd ${S}
 
-		cp configure.in configure.in.orig
-
-		epatch ${FILESDIR}/${PN}-0.6.9-dlloader.patch
-		export WANT_AUTOMAKE=1.6
-		export WANT_AUTOCONF=2.5
-		libtoolize --force --copy || die
-		aclocal || die
-		automake -a -f -c || die
-		autoheader || die
-		autoconf || die
-
 		# 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:" configure