--- /usr/portage/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3-r1.ebuild	2009-12-31 11:12:01.000000000 -0500
+++ xf86-input-wacom-0.10.4.ebuild	2010-02-08 18:06:21.603173269 -0500
@@ -8,9 +8,9 @@ inherit linux-info x-modular
 
 DESCRIPTION="Driver for Wacom tablets and drawing devices"
 LICENSE="GPL-2"
-EGIT_REPO_URI="git://anongit.freedesktop.org/~whot/xf86-input-wacom"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
 [[ ${PV} != 9999* ]] && \
-	SRC_URI="http://people.freedesktop.org/~whot/${PN}/${P}.tar.bz2"
+	SRC_URI="http://sourceforge.net/projects/linuxwacom/files/${PN}/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="hal debug"
@@ -29,13 +29,9 @@ pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable debug)"
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/0.10.3-protocol-4.patch"
-	x-modular_src_prepare
-}
-
 src_install() {
 	x-modular_src_install
+	rm -r "${D}/usr/share/hal"
 
 	if use hal; then
 		insinto /usr/share/hal/fdi/policy/10osvendor