Added to ~amd64.

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index e46cd856e809adfac09c93583babe57cd5bf4ea9..eb5c6191a73022a2c1cc9e82066a5e139de35369 100644 (file)
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2004/10/24 05:47:24 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.17 2004/11/18 08:05:26 eradicator Exp $
+
+  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)
 

diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 09852925bea81e939bf270a30db2ad14e87d26a5..c50ffa0493de7d191bc20f4a110ce743f0f82f80 100644 (file)
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,8 +1,19 @@
-MD5 b560196d1050cdf0aa348344bedfa71b ChangeLog 2783
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eba6549a73f015017781780283e5f36c ChangeLog 2926
 MD5 c2f927beefe923be43b483186af5c2d2 linuxwacom-0.6.2.ebuild 3241
 MD5 70ea4ce06ce2c28cd4c3526a20d08c29 linuxwacom-0.6.3.ebuild 3239
 MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
-MD5 cef89090644d79eed93d0a9cfe72280e linuxwacom-0.6.4.ebuild 3239
+MD5 2c8fe5a650a0e30ef25dec6e17a6c1cc linuxwacom-0.6.4.ebuild 3520
 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)
+
+iD8DBQFBnFfpArHZZzCEUG0RAso0AJ9gia96gMaLm9thyiicSyOTLz+01wCfU/XG
+gIrxA0BK9sHnJQPWfCwxbY8=
+=sROO
+-----END PGP SIGNATURE-----

diff --git a/x11-misc/linuxwacom/files/linuxwacom-0.6.4-nonx86.patch b/x11-misc/linuxwacom/files/linuxwacom-0.6.4-nonx86.patch
new file mode 100644 (file)
index 0000000..914916d
--- /dev/null
+++ b/x11-misc/linuxwacom/files/linuxwacom-0.6.4-nonx86.patch
@@ -0,0 +1,39 @@
+diff -Naur linuxwacom-0.6.4.orig/src/Makefile.am linuxwacom-0.6.4/src/Makefile.am
+--- linuxwacom-0.6.4.orig/src/Makefile.am      2004-07-29 14:31:55.000000000 -0700
++++ linuxwacom-0.6.4/src/Makefile.am   2004-11-17 23:53:12.445268388 -0800
+@@ -76,7 +76,7 @@
+ wcmFilter-v3.o: wcmFilter.c xf86Wacom.h
+ 
+ $(XF86OBJS): xf86Wacom.c Makefile
+-      gcc -O2 $(DEPFLAGS) -march=i386 -mcpu=$(ARCHITECTURE) -pipe -ansi \
++      gcc -O2 $(DEPFLAGS) -pipe -ansi \
+               -pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
+               -I. -I$(XF86_DIR)/programs/Xserver/hw/xfree86/common \
+               -I$(XF86_DIR)/programs/Xserver/hw/xfree86/loader \
+@@ -87,7 +87,7 @@
+               -I$(XF86_DIR)/include/extensions \
+               -I$(XF86_DIR) \
+               -I$(XF86_DIR)/exports/include \
+-              -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 \
+@@ -103,7 +103,7 @@
+       ld -r $(XF86OBJS) -o wacom_drv.o
+ 
+ $(XF86V3OBJS):
+-      gcc -O2 -march=i386 -mcpu=$(ARCHITECTURE) -fno-strength-reduce -ansi \
++      gcc -O2 -fno-strength-reduce -ansi \
+               -pedantic \
+               -I. -I$(XF86_V3_DIR)/programs/Xserver/hw/xfree86/common \
+               -I$(XF86_V3_DIR)/programs/Xserver/hw/xfree86/os-support \
+@@ -116,7 +116,7 @@
+               -I$(XF86_V3_DIR)/include/extensions \
+               -I \ -I$(XF86_V3_DIR) \
+               -I$(XF86_V3_DIR)/exports/include \
+-              -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L \
++              -Dlinux -D_POSIX_C_SOURCE=199309L \
+               -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE \
+               -D_SVID_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP \
+               -DXCSECURITY -DDPMSExtension -DPIXPRIV  -DGCCUSESGAS \

diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
index 99c9b0c4db6b8313d7034622b6b9c50411eadc63..c5de6d7b7383b5027735c1bb4b7a6693e9ebbf02 100644 (file)
--- a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
@@ -1,14 +1,18 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.2 2004/11/18 08:05:26 eradicator 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"
-KEYWORDS="x86"
-IUSE="gtk gtk2 tcltk sdk"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="virtual/x11
        gtk? (
@@ -20,6 +24,8 @@ RDEPEND="virtual/x11
 
 DEPEND="${RDEPEND}
        sys-devel/libtool
+       !x86? ( >=sys-devel/automake-1.6 
+               >=sys-devel/autoconf-2.53 )
        dev-util/pkgconfig
        >=sys-apps/sed-4"
 
@@ -54,6 +60,19 @@ pkg_setup() {
 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