Version bump, add libwacom dependency for bug #389633.

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 15 insertions, 122 deletions

diff --git a/x11-drivers/xf86-input-wacom/ChangeLog b/x11-drivers/xf86-input-wacom/ChangeLog
index 7498c7976fac..673ebbdd7573 100644
--- a/x11-drivers/xf86-input-wacom/ChangeLog
+++ b/x11-drivers/xf86-input-wacom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-wacom
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.78 2013/10/08 05:05:36 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.79 2014/01/07 09:06:30 chithanh Exp $
+
+*xf86-input-wacom-0.23.0 (07 Jan 2014)
+
+  07 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xf86-input-wacom-0.23.0.ebuild, -xf86-input-wacom-0.17.0.ebuild,
+  -xf86-input-wacom-0.18.0.ebuild, -xf86-input-wacom-0.19.0.ebuild:
+  Version bump, add libwacom dependency for bug #389633.
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xf86-input-wacom-0.20.0.ebuild:
   Stable for x86, wrt bug #475480
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.17.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.17.0.ebuild
deleted file mode 100644
index 48017d9803ff..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.17.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 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.17.0.ebuild,v 1.6 2013/07/18 10:40:56 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 ~arm ppc ppc64 x86"
-IUSE="debug"
-
-RDEPEND="virtual/udev
-	>=x11-base/xorg-server-1.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-
-	rm -rf "${ED}"/usr/share/hal
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	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"
-		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.19.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.19.0.ebuild
deleted file mode 100644
index 1348bbc03364..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.19.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 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.19.0.ebuild,v 1.3 2013/07/18 10:40:56 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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND="virtual/udev
-	>=x11-base/xorg-server-1.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-
-	rm -rf "${ED}"/usr/share/hal
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	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"
-		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.18.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.23.0.ebuild
index ff83df4006cb..ae3df2ca9f3a 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.18.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.23.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.18.0.ebuild,v 1.5 2013/07/18 10:40:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.23.0.ebuild,v 1.1 2014/01/07 09:06:30 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit linux-info xorg-2
 
@@ -16,7 +16,9 @@ EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-RDEPEND="virtual/udev
+# depend on libwacom for its udev rules, bug #389633
+RDEPEND="dev-libs/libwacom
+	virtual/udev
 	>=x11-base/xorg-server-1.7
 	x11-libs/libX11
 	x11-libs/libXext