Version bump to 0.10.5, clear out old versions.

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

5 files changed, 16 insertions, 134 deletions

diff --git a/x11-drivers/xf86-input-wacom/ChangeLog b/x11-drivers/xf86-input-wacom/ChangeLog
index 03d80d185f9c..21abdc6dfc80 100644
--- a/x11-drivers/xf86-input-wacom/ChangeLog
+++ b/x11-drivers/xf86-input-wacom/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-input-wacom
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.11 2010/02/09 11:57:21 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.12 2010/03/19 13:22:49 ikelos Exp $
+
+*xf86-input-wacom-0.10.5 (19 Mar 2010)
+
+  19 Mar 2010; Mike Auty <ikelos@gentoo.org>
+  -files/0.10.2-wheel-buttons.patch, -xf86-input-wacom-0.10.1.ebuild,
+  -xf86-input-wacom-0.10.2-r1.ebuild, -xf86-input-wacom-0.10.3.ebuild,
+  +xf86-input-wacom-0.10.5.ebuild:
+  Version bump to 0.10.5, clear out old versions.
 
 *xf86-input-wacom-0.10.4 (09 Feb 2010)
 
diff --git a/x11-drivers/xf86-input-wacom/files/0.10.2-wheel-buttons.patch b/x11-drivers/xf86-input-wacom/files/0.10.2-wheel-buttons.patch
deleted file mode 100644
index 2e9dba6a0b81..000000000000
--- a/x11-drivers/xf86-input-wacom/files/0.10.2-wheel-buttons.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/wcmCommon.c b/src/wcmCommon.c
-index e197973..ea3c937 100644
---- a/src/wcmCommon.c
-+++ b/src/wcmCommon.c
-@@ -616,6 +616,7 @@ static void sendWheelStripEvents(LocalDevicePtr local, const WacomDeviceState* d
- 
- 	switch (fakeButton & AC_TYPE)
- 	{
-+	    case 0: /* no spec. action defined */
- 	    case AC_BUTTON:
- 		/* send both button on/off in the same event for pad */	
- 		xf86PostButtonEvent(local->dev, is_absolute, fakeButton & AC_CODE,
-
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.1.ebuild
deleted file mode 100644
index a35ca116cd3c..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.1.ebuild,v 1.2 2009/12/10 08:51:37 zmedico Exp $
-
-EAPI="2"
-
-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"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="http://people.freedesktop.org/~whot/${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}
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	CONFIGURE_OPTIONS="$(use_enable debug)"
-}
-
-src_install() {
-	x-modular_src_install
-
-	if use hal; then
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		newins "${S}"/fdi/wacom.fdi 11-x11-wacom.fdi
-	fi
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	if ! 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 --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>   Event interface"
-		ewarn "      [*]   Tablets  --->"
-		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2-r1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2-r1.ebuild
deleted file mode 100644
index 2b55c2d807cc..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2-r1.ebuild,v 1.2 2009/12/10 08:51:37 zmedico Exp $
-
-EAPI="2"
-
-inherit linux-info x-modular eutils
-
-DESCRIPTION="Driver for Wacom tablets and drawing devices"
-LICENSE="GPL-2"
-EGIT_REPO_URI="git://anongit.freedesktop.org/~whot/xf86-input-wacom"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="http://people.freedesktop.org/~whot/${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}
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	CONFIGURE_OPTIONS="$(use_enable debug)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/0.10.2-wheel-buttons.patch"
-	x-modular_src_prepare
-}
-
-src_install() {
-	x-modular_src_install
-
-	if use hal; then
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		newins "${S}"/fdi/wacom.fdi 11-x11-wacom.fdi
-	fi
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	if ! 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 --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>   Event interface"
-		ewarn "      [*]   Tablets  --->"
-		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.5.ebuild
index 3fdfdbe342da..037ac722035d 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.3.ebuild,v 1.1 2009/12/23 23:48:41 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.5.ebuild,v 1.1 2010/03/19 13:22:49 ikelos Exp $
 
 EAPI="2"
 
@@ -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="mirror://sourceforge/linuxwacom/files/${PN}/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="hal debug"
@@ -31,6 +31,7 @@ pkg_setup() {
 
 src_install() {
 	x-modular_src_install
+	rm -r "${D}/usr/share/hal"
 
 	if use hal; then
 		insinto /usr/share/hal/fdi/policy/10osvendor
@@ -41,7 +42,8 @@ src_install() {
 pkg_postinst() {
 	x-modular_pkg_postinst
 
-	if ! linux_chkconfig_present TABLET_USB_WACOM \
+	if ! linux_config_exists \
+	|| ! 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"