[gentoo-commits] proj/x11:master commit in: x11-drivers/xf86-input-mouse/, x11-drivers/xf86-input-synaptics/, ...

[Tomas Chvatal]

commit:     fa266ad41a7353c9a5643d52f93c8f46a31cbe17
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 12:30:22 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May  8 12:30:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=fa266ad4

[xf86-input-*] Adapt for dep handling that is now done in eclass.

---
 .../xf86-input-evdev/xf86-input-evdev-9999.ebuild  |    4 +---
 .../xf86-input-joystick-9999.ebuild                |    4 +---
 .../xf86-input-keyboard-9999.ebuild                |    6 +-----
 .../xf86-input-mouse/xf86-input-mouse-9999.ebuild  |    5 +----
 .../xf86-input-synaptics-9999.ebuild               |    7 +++----
 .../xf86-input-wacom/xf86-input-wacom-9999.ebuild  |    9 +++------
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
index 365aca8..3e8aad0 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
@@ -11,6 +11,4 @@ IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6.3"
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6
-	x11-proto/inputproto
-	x11-proto/xproto"
+	>=sys-kernel/linux-headers-2.6"

diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
index f4920e8..5c41934 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
@@ -11,6 +11,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/kbproto"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
index 8bb0a90..68cbd98 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
@@ -11,8 +11,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6.3"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/xproto"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
index 88517e2..c61ddd5 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
@@ -11,7 +11,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.5.99.901"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
index 8fe2b85..0b33ab6 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
@@ -17,13 +17,12 @@ RDEPEND="
 	>=x11-libs/libXi-1.2
 	>=x11-libs/libXtst-1.1.0"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto
 	>=x11-proto/recordproto-1.14"
 
-DOCS=( "README" )
+DOCS=( README )
 
-pkg_postinst() {
-	xorg-2_pkg_postinst
+pkg_pretend() {
+	linux-info_pkg_setup
 	# Just a friendly warning
 	if ! linux_config_exists \
 			|| ! linux_chkconfig_present INPUT_EVDEV; then

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 fbaf240..a93fa96 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
@@ -23,10 +23,7 @@ RDEPEND="!x11-drivers/linuxwacom
 	x11-libs/libXi
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/xproto"
+	x11-proto/randrproto"
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -42,8 +39,8 @@ src_install() {
 	rm -rf "${D}"/usr/share/hal
 }
 
-pkg_postinst() {
-	xorg-2_pkg_postinst
+pkg_pretend() {
+	linux-info_pkg_setup
 
 	if ! linux_config_exists \
 			|| ! linux_chkconfig_present TABLET_USB_WACOM \