[gentoo-commits] proj/x11:master commit in: x11-drivers/xf86-input-wacom/

["Tomas Chvatal" <scarabeus@gentoo.org>]

commit:     bb58344ac9efeabc63d4740feac4f1477429bfe3
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 18:55:23 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 18:55:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=bb58344a

[x11-drivers/xf86-input-wacom] sync with main tree

---
 .../xf86-input-wacom/xf86-input-wacom-9999.ebuild  |   32 +++++++++++--------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
index b40e189..a41005d 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.8-r1.ebuild,v 1.2 2011/02/20 10:54:27 ssuominen Exp $
 
 EAPI=4
+
 inherit linux-info xorg-2
 
 DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
 LICENSE="GPL-2"
 EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="hal debug"
-
-COMMON_DEPEND=">=x11-base/xorg-server-1.6
-	hal? ( sys-apps/hal )"
-RDEPEND="${COMMON_DEPEND}
-	!x11-drivers/linuxwacom"
-DEPEND="${COMMON_DEPEND}
+IUSE="debug"
+
+RDEPEND="!x11-drivers/linuxwacom
+	>=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
 	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
 	x11-proto/xproto"
 
 pkg_setup() {
 	linux-info_pkg_setup
-	xorg-2_pkg_setup
 
 	CONFIGURE_OPTIONS="$(use_enable debug)"
 }
@@ -32,16 +37,15 @@ pkg_setup() {
 src_install() {
 	xorg-2_src_install
 
-	use hal || rm -fr "${D}/usr/share/hal"
-
+	rm -rf "${D}"/usr/share/hal
 }
 
 pkg_postinst() {
 	xorg-2_pkg_postinst
 
 	if ! linux_config_exists \
-	|| ! linux_chkconfig_present TABLET_USB_WACOM \
-	|| ! linux_chkconfig_present INPUT_EVDEV; then
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
 		echo
 		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
 		ewarn "  Device Drivers --->"