[gentoo-commits] gentoo-x86 commit in x11-drivers/linuxwacom: ChangeLog linuxwacom-0.7.4_p3.ebuild linuxwacom-0.7.9_p7.ebuild

[Mike Auty (ikelos)]

ikelos      08/02/12 22:29:19

  Modified:             ChangeLog linuxwacom-0.7.4_p3.ebuild
  Added:                linuxwacom-0.7.9_p7.ebuild
  Log:
  Include masked linuxwacom for testing to work with 2.6.24.
  (Portage version: 2.1.4.3)

Revision  Changes    Path
1.19                 x11-drivers/linuxwacom/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	8 Feb 2008 21:49:01 -0000	1.18
+++ ChangeLog	12 Feb 2008 22:29:19 -0000	1.19
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.18 2008/02/08 21:49:01 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.19 2008/02/12 22:29:19 ikelos Exp $
+
+*linuxwacom-0.7.9_p7 (12 Feb 2008)
+
+  12 Feb 2008; Mike Auty <ikelos@g.o>
+  +files/linuxwacom-0.7.9-2.6.24.patch,
+  +files/linuxwacom-0.7.9-no-tcl.patch, +linuxwacom-0.7.9_p7.ebuild:
+  Include masked linuxwacom for testing to work with 2.6.24.
 
 *linuxwacom-0.7.8_p3-r1 (08 Feb 2008)
 



1.11                 x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild?r1=1.10&r2=1.11

Index: linuxwacom-0.7.4_p3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linuxwacom-0.7.4_p3.ebuild	30 Dec 2007 16:09:28 -0000	1.10
+++ linuxwacom-0.7.4_p3.ebuild	12 Feb 2008 22:29:19 -0000	1.11
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.10 2007/12/30 16:09:28 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.11 2008/02/12 22:29:19 ikelos Exp $
 
 IUSE="gtk tcl tk usb"
 



1.1                  x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild?rev=1.1&content-type=text/plain

Index: linuxwacom-0.7.9_p7.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild,v 1.1 2008/02/12 22:29:19 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 module"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"

RDEPEND="|| ( ( x11-proto/inputproto
		x11-base/xorg-server )
		  virtual/x11 )
	media-libs/libpixman
	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 "     USB support"
			eerror "           <M> Wacom Intuos/Graphire tablet support"
			eerror
			eerror "(in the same page is suggested to include as modules 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%%-*}"
	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%_p*}-no-tcl.patch
	epatch "${FILESDIR}"/${P%_p*}-2.6.24.patch
	eautoreconf
}

src_compile() {
	if use gtk; then
		myconf="--with-gtk=2.0"
	else
		myconf="--with-gtk=no"
	fi

	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 \
		--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/
	newins "${FILESDIR}"/xserver-xorg-input-wacom.udev 60-wacom.rules

	exeinto /lib/udev/
	doexe "${FILESDIR}"/check_driver
	doman "${FILESDIR}"/check_driver.1

	dohtml -r docs/*
	dodoc AUTHORS ChangeLog NEWS README
}



-- 
gentoo-commits@l.g.o mailing list