Add dlloader USE flag, which installs a DSO linuxwacom Xorg driver. Furthermore, conform to Gentoo xorg migration, /usr/X11R6 -> /usr.

(Portage version: 2.0.51.22-r1)

10 files changed, 70 insertions, 362 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 0c6da5242c5d..d32bcc893db1 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2005/06/07 23:34:34 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.29 2005/07/22 23:10:15 battousai Exp $
+
+  22 Jul 2005; Bryan Stine <battousai@gentoo.org>
+  -files/linuxwacom-0.6.4-nonx86.patch, -linuxwacom-0.6.3.ebuild,
+  -linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild,
+  linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild:
+  Add dlloader USE flag, which installs a DSO linuxwacom Xorg driver.
+  Furthermore, conform to Gentoo xorg migration, /usr/X11R6 -> /usr.
 
 *linuxwacom-0.6.8 (07 Jun 2005)
 
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 1788ebfab2d0..1810715c282f 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,14 +1,9 @@
 MD5 fffa92015a3c61e5f7f6fb8347698440 ChangeLog 4588
-MD5 a9e75705cd68f2ac78676624c583cb48 linuxwacom-0.6.3.ebuild 3240
-MD5 97b48494a961baa4d4dacea03dbcc6b6 linuxwacom-0.6.4.ebuild 3901
-MD5 0d20049d7ac0598683dc588cead5b09a linuxwacom-0.6.6.ebuild 3812
+MD5 64e679d6267ead84f55880085e904842 linuxwacom-0.6.6.ebuild 3524
 MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
-MD5 0c0f2f9c376402c8b82de7631542fabf linuxwacom-0.6.7.ebuild 3562
-MD5 4ec70aa473e6f5b23f8c2d7648173067 linuxwacom-0.6.8.ebuild 3563
-MD5 78a65c4833619b5ad2df32981808eb6a files/digest-linuxwacom-0.6.3 69
-MD5 845ee9f0e43d25914f1483ce14c7d692 files/digest-linuxwacom-0.6.4 69
+MD5 f1879062cecda904bd3a6c7bd69621f1 linuxwacom-0.6.7.ebuild 3290
+MD5 e21786b3de3346df7ae949bf33f94597 linuxwacom-0.6.8.ebuild 3305
 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.3 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.3
deleted file mode 100644
index 3aafec64cbcd..000000000000
--- a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1be441647cba1bfaeef2804eb53a3fd linuxwacom-0.6.3.tar.bz2 436742
diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.4 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.4
deleted file mode 100644
index a66a8dfa7880..000000000000
--- a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2313def6800aa4ad48ddc2029f349dd3 linuxwacom-0.6.4.tar.bz2 433762
diff --git a/x11-misc/linuxwacom/files/linuxwacom-0.6.4-nonx86.patch b/x11-misc/linuxwacom/files/linuxwacom-0.6.4-nonx86.patch
deleted file mode 100644
index 914916dc8c1d..000000000000
--- a/x11-misc/linuxwacom/files/linuxwacom-0.6.4-nonx86.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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.3.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild
deleted file mode 100644
index ad4b4a84815a..000000000000
--- a/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.3.ebuild,v 1.10 2005/02/09 03:06:11 battousai Exp $
-
-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"
-
-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
-	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 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/lib/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/lib/Server:" Makefile
-		sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/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}
-	emake || die "build failed."
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "Install failed."
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
deleted file mode 100644
index 43029ce23990..000000000000
--- a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.4.ebuild,v 1.7 2005/02/09 03:06:11 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
-
-		libtoolize -c -f
-		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
-		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"
-		econf ${myconf} || die "configure failed."
-	fi
-	cd ${S}
-	emake || die "build failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
index 4bf15c094829..6ab46ecc6ba1 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
@@ -1,8 +1,8 @@
 # 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.6.ebuild,v 1.6 2005/04/14 22:24:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.7 2005/07/22 23:10:15 battousai Exp $
 
-IUSE="gtk gtk2 tcltk sdk"
+IUSE="dlloader gtk gtk2 tcltk sdk"
 
 inherit eutils
 
@@ -33,23 +33,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use sdk; then
-		if has_version ">=x11-base/xfree-4.3.0-r7"
+		if ! built_with_use xorg-x11 sdk
 		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."
+			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
 		einfo "Building against the X11 SDK. This will install updated X drivers and userland tools."
 	else
@@ -105,14 +93,11 @@ src_compile() {
 	if use amd64 ; then
 		myconf="${myconf} --enable-xserver64"
 	fi
+	myconf="${myconf} --with-xorg-sdk=/usr/$(get_libdir)/Server/ --with-xlib=/usr/$(get_libdir)"
 
 	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
+		myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server"
 
 		econf ${myconf} || die "configure failed."
 
@@ -126,10 +111,21 @@ src_compile() {
 	cd ${S}
 	unset ARCH
 	emake || die "build failed."
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		cd ${S}/src
+		$(tc-getCC) -shared -nostdlib -o wacom_drv.so wacom_drv.o -Bstatic -lgcc
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed."
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		exeinto /usr/$(get_libdir)/modules/input
+		newexe src/wacom_drv.so wacom_drv.so
+		rm ${D}/usr/$(get_libdir)/modules/input/wacom_drv.o
+	fi
 	dohtml -r docs/*
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
index 0569c8cbf7b4..eccb5b39d6be 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.7.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.7.ebuild,v 1.3 2005/06/07 23:34:34 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.7.ebuild,v 1.4 2005/07/22 23:10:15 battousai Exp $
 
-IUSE="gtk gtk2 tcltk sdk usb"
+IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Input driver for Wacom tablets and drawing devices"
 HOMEPAGE="http://linuxwacom.sourceforge.net/"
@@ -32,23 +32,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use sdk; then
-		if has_version ">=x11-base/xfree-4.3.0-r7"
+		if ! built_with_use xorg-x11 sdk
 		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."
+			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
 		einfo "Building against the X11 SDK. This will install updated X drivers and userland tools."
 	else
@@ -90,14 +78,11 @@ src_compile() {
 	if use amd64 ; then
 		myconf="${myconf} --enable-xserver64"
 	fi
+	myconf="${myconf} --with-xorg-sdk=/usr/$(get_libdir)/Server/ --with-xlib=/usr/$(get_libdir)"
 
 	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
+		myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server"
 
 		econf ${myconf} || die "configure failed."
 
@@ -111,10 +96,21 @@ src_compile() {
 	cd ${S}
 	unset ARCH
 	emake || die "build failed."
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		cd ${S}/src
+		$(tc-getCC) -shared -nostdlib -o wacom_drv.so wacom_drv.o -Bstatic -lgcc
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed."
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		exeinto /usr/$(get_libdir)/modules/input
+		newexe src/wacom_drv.so wacom_drv.so
+		rm ${D}/usr/$(get_libdir)/modules/input/wacom_drv.o
+	fi
 	dohtml -r docs/*
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
index 2f7559c2fd57..7a10deff53a5 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.8.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.8.ebuild,v 1.1 2005/06/07 23:34:34 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.8.ebuild,v 1.2 2005/07/22 23:10:15 battousai Exp $
 
-IUSE="gtk gtk2 tcltk sdk usb"
+IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Input driver for Wacom tablets and drawing devices"
 HOMEPAGE="http://linuxwacom.sourceforge.net/"
@@ -32,23 +32,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use sdk; then
-		if has_version ">=x11-base/xfree-4.3.0-r7"
+		if ! built_with_use xorg-x11 sdk
 		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."
+			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
 		einfo "Building against the X11 SDK. This will install updated X drivers and userland tools."
 	else
@@ -90,14 +78,11 @@ src_compile() {
 	if use amd64 ; then
 		myconf="${myconf} --enable-xserver64"
 	fi
+	myconf="${myconf} --with-xorg-sdk=/usr/$(get_libdir)/Server/ --with-xlib=/usr/$(get_libdir)"
 
 	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
+		myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server"
 
 		econf ${myconf} || die "configure failed."
 
@@ -111,10 +96,21 @@ src_compile() {
 	cd ${S}
 	unset ARCH
 	emake || die "build failed."
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		cd ${S}/src
+		$(tc-getCC) -shared -nostdlib -o wacom_drv.so wacom_drv.o -Bstatic -lgcc
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed."
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		exeinto /usr/$(get_libdir)/modules/input
+		newexe src/wacom_drv.so wacom_drv.so
+		rm ${D}/usr/$(get_libdir)/modules/input/wacom_drv.o
+	fi
 	dohtml -r docs/*
 	dodoc AUTHORS ChangeLog NEWS README
 }