Version bump to 0.8.4_p1, fixes bug 283400.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 130 insertions, 5 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index eaf9ae6b35c5..90a6ce5f0f4a 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2009/07/28 15:50:06 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.40 2009/09/03 08:38:01 ikelos Exp $
+
+*linuxwacom-0.8.4_p1 (03 Sep 2009)
+
+  03 Sep 2009; Mike Auty <ikelos@gentoo.org> +linuxwacom-0.8.4_p1.ebuild:
+  Version bump to 0.8.4_p1, fixes bug 283400.
 
 *linuxwacom-0.8.3_p6 (28 Jul 2009)
 
diff --git a/x11-drivers/linuxwacom/Manifest b/x11-drivers/linuxwacom/Manifest
index 7786b293cee7..e41b63748b37 100644
--- a/x11-drivers/linuxwacom/Manifest
+++ b/x11-drivers/linuxwacom/Manifest
@@ -10,16 +10,18 @@ DIST linuxwacom-0.8.2-2.tar.bz2 1098067 RMD160 850ef22abf12e21d69e299b55a2114502
 DIST linuxwacom-0.8.2.tar.bz2 1092825 RMD160 2485eea1a3f0d5f50de6a3b7286d39b81ad553c4 SHA1 96ba8783b9756bc8ac418c62faafacf28841e212 SHA256 5f3096d7194940ca583be8b63b59bb75001d01f1a4a75c1807c8f01cf697dfb5
 DIST linuxwacom-0.8.3-2.tar.bz2 1147631 RMD160 99b02579a75a129cd5003d95fe229f7c102ec498 SHA1 5b528f7d1d18ea73d8a4983c7778f3d6a5968e7e SHA256 c38300cb5bca30ecdaac829c7a27be94eedb5ab97cc8f56b34d1bb0e64537c04
 DIST linuxwacom-0.8.3-6.tar.bz2 1152871 RMD160 3c08fcee7c4bd2c5bffa0c03218a377bbc2200e5 SHA1 4fce8180f2846d578b7a08f29533485b616802e4 SHA256 d09bafc25757ba12d6e4a1fc90d742f2a841d7e16c440c62fea444ebb1c4c10b
+DIST linuxwacom-0.8.4-1.tar.bz2 1178689 RMD160 83ede914c768cd345198979bcae8ee06366422fd SHA1 771073162da25e1573309a87755df9869516e04c SHA256 e9c3cbc001b9453e6bc92d529c98ae55f79b5d1f386df400070db1105395dabd
 EBUILD linuxwacom-0.8.2.ebuild 3079 RMD160 28ba2d2a247c136eefed1811dbe883a9499ca836 SHA1 61041f4346bc010dcfa8c0fbc79171e4547ab9d3 SHA256 ae1f4d687c914b1efd28b35c14b9ad04e5997de7b0f3c92967e2763167c036f1
 EBUILD linuxwacom-0.8.2_p2.ebuild 3147 RMD160 b1ede86176d68f76a7adc257ad9d7ed9cad15365 SHA1 43d8c65df7da39a44f5459fef06c015d3746041e SHA256 146a354eb605a8167b6a38f9d7575ee88f3174cc304cd028d7aa3af622be9bdb
 EBUILD linuxwacom-0.8.3_p2.ebuild 3203 RMD160 8d85f50bedbb21f075a2f0f87841a353508f973a SHA1 42ab8eb67fe29f7fa7edbbbb66220a37c824d3ed SHA256 1dcfe61330f78c9c08ef097d74e1828a602c2d7e11c4ad5a6c74c2da19f0f04b
 EBUILD linuxwacom-0.8.3_p6.ebuild 3180 RMD160 407652053bad2b123b30ca48162a0ac66ea0980c SHA1 09f97a5cc48d24dac5a9a6e388ae56f21764523f SHA256 d1b8a9f9cec3d0f98f3bfaa9eee24c4e178554f22616947457550cab97355805
-MISC ChangeLog 14061 RMD160 ac0eccdf4fb189c21e377e93ee1c1c87ceb69cd3 SHA1 c0834f2dc632145ecbd91282aa84c2d0084e5a09 SHA256 6441d29c92c8fd02a7954cb1dac5eb6cf741c5155275b2c10ad0c468b400845e
+EBUILD linuxwacom-0.8.4_p1.ebuild 3178 RMD160 8ba8d563694566e67496e4e72191e37f31f195e0 SHA1 abf6ebd8f9037998b631cb03e906828624545427 SHA256 74f6fdfbed29b056c0ab13352984f7666c6202b84ea4d787011874bf50191c54
+MISC ChangeLog 14218 RMD160 84b0ae42e190813a63a471b9e827984d82dc4440 SHA1 d4fe5d31f1639293674b822c25b6e409102daa93 SHA256 49413a321c812c0815dd4217983e90810a727e0f4b280096881c63e6534fa018
 MISC metadata.xml 525 RMD160 380f5e9f0bb342944fab6998a48487c4997fc135 SHA1 4e496236e555ae633d0c528ecac33eb43786bd3a SHA256 0916ff7fc43636f8c1d6c66567f03e0692d99f670abc07f4d2168d2afa70bd8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpvHlAACgkQu7rWomwgFXrCIQCgjlMqyrczAFvIZkE90N+owyWo
-gSUAoJ4sChLKesW0jnb8gzjzXeBsXqdV
-=M4i3
+iEYEARECAAYFAkqfgHMACgkQu7rWomwgFXq3JwCeI/vPP9RKSYYHATNmc/1X2oxo
+mcAAnArNWLF+YqBqXsN6MlUjMKUD/puD
+=h2HR
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild
new file mode 100644
index 000000000000..005e4b1e8287
--- /dev/null
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild
@@ -0,0 +1,118 @@
+# 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.4_p1.ebuild,v 1.1 2009/09/03 08:38:01 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 modules"
+
+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 modules ; 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}/${PN}-0.8.3_p6-xf86config.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	if use modules; 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 modules; 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
+
+	dodoc AUTHORS ChangeLog README
+
+	ewarn "Please remove any HAL .FDI files you may"
+	ewarn "previously have installed fr linuxwacom."
+}