Version bump, temporarily removes buildable module support, fixes bug 274520.

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 172 insertions, 1 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index cbe8a22138b3..eaf9ae6b35c5 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.38 2009/07/28 14:49:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.39 2009/07/28 15:50:06 ikelos Exp $
+
+*linuxwacom-0.8.3_p6 (28 Jul 2009)
+
+  28 Jul 2009; Mike Auty <ikelos@gentoo.org> +linuxwacom-0.8.3_p6.ebuild,
+  +files/linuxwacom-0.8.3_p6-xf86config.patch:
+  Version bump, temporarily removes buildable module support, fixes bug
+  274520.
 
   28 Jul 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   x11-drivers -> x11.
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch
new file mode 100644
index 000000000000..dc7d645beb03
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch
@@ -0,0 +1,45 @@
+diff --git a/configure.in b/configure.in
+index a4f5fbb..ccf6e9f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -562,19 +562,27 @@ if test "$WCM_ENV_XFREE86" != yes; then
+ fi
+ AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes])
+ 
+-AC_MSG_CHECKING(for lib xf86config)
+-if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; then
+-	if test -f $WCM_XFREE86_DIR/$XFREE86SUBDIR/xf86Parser.h; then
+-		AC_MSG_RESULT([found, $WCM_XFREE86_DIR/$XFREE86SUBDIR])
+-		WCM_ENV_XF86CONFIG=yes
+-		CFLAGS="$CFLAGS -I$WCM_XFREE86_DIR/$XFREE86SUBDIR"
+-	elif test -f $WCM_XORGSDK_DIR/xf86Parser.h; then
+-		AC_MSG_RESULT([found, $WCM_XORGSDK_DIR])
+-		WCM_ENV_XF86CONFIG=yes
+-	elif test -f $WCM_XLIB_DIR/../include/xf86Parser.h; then
+-		AC_MSG_RESULT([found, $WCM_XLIB_DIR/../include])
+-		WCM_ENV_XF86CONFIG=yes
+-		CFLAGS="$CFLAGS -I$WCM_XLIB_DIR/../include"	
++WCM_OPTION_XF86CONFIG=no
++AC_ARG_ENABLE(xf86config,
++        AC_HELP_STRING([--enable-xf86config], [Enable libxf86config support if present [[default=yes]]]),
++        [ WCM_OPTION_XF86CONFIG=$enableval ],
++        [ WCM_OPTION_XF86CONFIG=yes ])
++
++if test "$WCM_OPTION_XF86CONFIG" = yes; then
++	AC_MSG_CHECKING(for lib xf86config)
++	if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; then
++		if test -f $WCM_XFREE86_DIR/$XFREE86SUBDIR/xf86Parser.h; then
++			AC_MSG_RESULT([found, $WCM_XFREE86_DIR/$XFREE86SUBDIR])
++			WCM_ENV_XF86CONFIG=yes
++			CFLAGS="$CFLAGS -I$WCM_XFREE86_DIR/$XFREE86SUBDIR"
++		elif test -f $WCM_XORGSDK_DIR/xf86Parser.h; then
++			AC_MSG_RESULT([found, $WCM_XORGSDK_DIR])
++			WCM_ENV_XF86CONFIG=yes
++		elif test -f $WCM_XLIB_DIR/../include/xf86Parser.h; then
++			AC_MSG_RESULT([found, $WCM_XLIB_DIR/../include])
++			WCM_ENV_XF86CONFIG=yes
++			CFLAGS="$CFLAGS -I$WCM_XLIB_DIR/../include"	
++		fi
+ 	fi
+ fi
+ 
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
new file mode 100644
index 000000000000..cb9d2befe44a
--- /dev/null
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild,v 1.1 2009/07/28 15:50:06 ikelos Exp $
+
+inherit eutils autotools toolchain-funcs linux-mod
+
+DESCRIPTION="Input driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tar.bz2"
+
+IUSE="gtk tcl tk usb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="x11-proto/inputproto
+	x11-base/xorg-server
+	gtk? ( >=x11-libs/gtk+-2 )
+	tcl? ( dev-lang/tcl )
+	tk?  ( dev-lang/tk )
+	sys-fs/udev
+	sys-libs/ncurses"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )"
+S=${WORKDIR}/${P/_p/-}
+
+MODULE_NAMES="wacom(input:${S}/src:${S}/src)"
+
+wacom_check() {
+	if use module ; then
+		ebegin "Checking for wacom module"
+		linux_chkconfig_module TABLET_USB_WACOM
+		eend $?
+
+		if [[ $? -ne 0 ]] || ! [ -f "/lib/modules/${KV}/kernel/drivers/input/tablet/wacom.ko" ]; then
+			eerror "You need to have your kernel compiled with wacom as a module"
+			eerror "to let linuxwacom overwrite it."
+			eerror "Enable it in the kernel, found at:"
+			eerror
+			eerror " Device Drivers"
+			eerror "    Input device support"
+			eerror "        Tablets"
+			eerror "            <M> Wacom Intuos/Graphire tablet support (USB)"
+			eerror
+			eerror "(in the "USB support" page it is suggested to include also:"
+			eerror "EHCI , OHCI , USB Human Interface Device+HID input layer)"
+			eerror
+			eerror "Then recompile kernel. Otherwise, remove the module USE flag."
+			die "Wacom not compiled in kernel as a module!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	# echo "kernel version is ${KV} , name is ${KV%%-*}"
+	ewarn "Versions of linuxwacom >= 0.7.9 require gcc >= 4.2 to compile."
+	wacom_check
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix multilib-strict error for Tcl/Tk library install
+	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
+
+	# Remove warning parameters for gcc < 4, bug 205139
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am
+	fi
+
+	epatch "${FILESDIR}/${P}-xf86config.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	if use module; then
+		myconf="${myconf} --enable-wacom"
+		myconf="${myconf} --with-kernel=${KV_OUT_DIR}"
+	fi
+
+	econf ${myconf} \
+		$(use_with tcl tcl) \
+		$(use_with tk tk) \
+		--enable-wacomdrv --enable-wacdump \
+		--disable-xf86config \
+		--enable-xsetwacom --enable-dlloader || die "econf failed"
+
+	unset ARCH
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed."
+
+	# Inelegant attempt to work around a nasty build system
+	if use module; then
+		cp "${S}"/src/*/wacom.{o,ko} "${S}"/src/
+		linux-mod_src_install
+	fi
+
+	insinto /etc/udev/rules.d/
+	doins "${S}/src/util/60-wacom.rules"
+
+	exeinto /lib/udev/
+	doexe "${FILESDIR}"/check_driver
+	doman "${FILESDIR}"/check_driver.1
+
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+
+	ewarn "Please remove any HAL .FDI files you may"
+	ewarn "previously have installed fr linuxwacom."
+}