From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Sat, 1 Jan 2005 01:52:19 +0000 (+0000)
Subject: Works with newer xorg-x11 now.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fbc27b9a148d8c6ddc684ebe900c7afcd2c2c54c;p=gentoo.git

Works with newer xorg-x11 now.
---

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index e64f90177bbb..064d994ddf37 100644
--- 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.19 2004/12/31 21:40:35 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.20 2005/01/01 01:52:19 eradicator Exp $
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild:
+  Works with /usr/libdir xorg-x11 installs now.
 
 *linuxwacom-0.6.6 (31 Dec 2004)
 
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index f0b1fca1ac87..0d5fc5639392 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,12 +1,22 @@
-MD5 3923ee217ff9125b1e1080f94c29e874 ChangeLog 3477
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 c2f927beefe923be43b483186af5c2d2 linuxwacom-0.6.2.ebuild 3241
 MD5 70ea4ce06ce2c28cd4c3526a20d08c29 linuxwacom-0.6.3.ebuild 3239
-MD5 cd33d7feb9a2a2c28aa8d1bbef6f8640 linuxwacom-0.6.4.ebuild 3643
 MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
-MD5 e2e068014e1bce3748d4e9bb13837c00 linuxwacom-0.6.6.ebuild 3654
+MD5 689b1399f2aa031b1175f62ced856b42 linuxwacom-0.6.4.ebuild 3883
+MD5 d90e558436e04034333b29384111e75d linuxwacom-0.6.6.ebuild 3708
+MD5 62cc2d598d55d05974278e911b68954d ChangeLog 3636
 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
-MD5 97ebb9a35c19c6f15f8fb9ac4b847d09 files/linuxwacom-0.6.6-nonx86.patch 609
 MD5 fe1457589d41bcc4b2407351e6ae2faf files/digest-linuxwacom-0.6.6 69
+MD5 97ebb9a35c19c6f15f8fb9ac4b847d09 files/linuxwacom-0.6.6-nonx86.patch 609
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB1gJeArHZZzCEUG0RAt1DAJ9C6cfwgaWPzo8mgwnJSl6EqvsHjQCeJpYf
+jf3bTopIaZxHS1ioX5xd1YM=
+=N4iV
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
index 6a63289a0a02..6aa182668065 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2004/11/24 11:40:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.6 2005/01/01 01:52:19 eradicator Exp $
 
 IUSE="gtk gtk2 tcltk sdk"
 
@@ -110,8 +110,13 @@ src_compile() {
 		# 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
+		if [ -f "/usr/X11R6/lib/Server/include/xf86Version.h" ]; then
+			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
+		else
+			sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/$(get_libdir)/Server:" Makefile
+			sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/$(get_libdir)/Server:" Makefile
+		fi
 		sed -i -e "s:/include/extensions:/include:g" Makefile
 	else
 		myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk"
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
index 7c22c4d7cc8a..82920d020c4f 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.2 2005/01/01 01:52:19 eradicator Exp $
 
 IUSE="gtk gtk2 tcltk sdk"
 
@@ -104,14 +104,17 @@ src_compile() {
 	fi
 
 	if use sdk; then
-		myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/$(get_libdir)/Server $withgtk $withtcltk"
+		myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk"
+		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
-		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"