Version bump. Drop old.

(Portage version: 2.2_rc75/cvs/Linux x86_64)

3 files changed, 17 insertions, 79 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 111fd6de0d73..af8eee5af356 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.50 2010/04/21 16:23:50 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.51 2010/09/08 20:38:40 scarabeus Exp $
+
+*xf86-input-synaptics-1.3.0 (08 Sep 2010)
+
+  08 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-synaptics-1.2.2.ebuild, -xf86-input-synaptics-1.2.2-r2.ebuild,
+  +xf86-input-synaptics-1.3.0.ebuild:
+  Version bump. Drop old.
 
 *xf86-input-synaptics-1.2.2-r2 (21 Apr 2010)
 
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2-r2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2-r2.ebuild
deleted file mode 100644
index d5d35b7f4111..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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-synaptics/xf86-input-synaptics-1.2.2-r2.ebuild,v 1.1 2010/04/21 16:23:50 chainsaw Exp $
-
-inherit linux-info x-modular
-
-DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="hal"
-
-RDEPEND="
-	>=x11-base/xorg-server-1.8
-	>=x11-libs/libXi-1.2
-	x11-libs/libXtst
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	>=sys-apps/sed-4"
-
-src_install() {
-	DOCS="INSTALL TODO README"
-	x-modular_src_install
-
-	if use hal ; then
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
-
-	insinto /etc/X11/xorg.conf.d
-	newins "${FILESDIR}/${PV}-xorg-inputclass" 20-synaptics.conf || die "Unable to install xorg inputclass policy file"
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-	# Just a friendly warning
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "This driver requires event interface support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>     Event interface"
-		echo
-	fi
-	if use hal ; then
-		elog "If you want to modify Synaptics settings, please create an fdi file in:"
-		elog "/etc/hal/fdi/policy/"
-		echo
-		ewarn "The current default are set by :"
-		ewarn "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
-		ewarn "You can use this file for inspiration, but DO NOT EDIT IT directly."
-	fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.3.0.ebuild
index 566cea1fb0a6..e553e7dcb196 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.3.0.ebuild
@@ -1,8 +1,10 @@
 # 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-synaptics/xf86-input-synaptics-1.2.2.ebuild,v 1.3 2010/04/10 09:46:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.3.0.ebuild,v 1.1 2010/09/08 20:38:40 scarabeus Exp $
 
-inherit linux-info x-modular
+EAPI=3
+
+inherit linux-info xorg-2
 
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
@@ -11,26 +13,18 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="hal"
 
 RDEPEND="
-	>=x11-base/xorg-server-1.6
+	>=x11-base/xorg-server-1.8[hal?]
 	>=x11-libs/libXi-1.2
-	x11-libs/libXtst
-	hal? ( sys-apps/hal )"
+	>=x11-libs/libXtst-1.1.0"
 DEPEND="${RDEPEND}
 	x11-proto/inputproto
-	>=sys-apps/sed-4"
+	>=x11-proto/recordproto-1.14"
 
 src_install() {
-	DOCS="INSTALL TODO README"
-	x-modular_src_install
-
-	if use hal ; then
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
+	DOCS="README" xorg-2_src_install
 }
-
 pkg_postinst() {
-	x-modular_pkg_postinst
+	xorg-2_pkg_postinst
 	# Just a friendly warning
 	if ! linux_config_exists \
 			|| ! linux_chkconfig_present INPUT_EVDEV; then
@@ -41,12 +35,4 @@ pkg_postinst() {
 		ewarn "      <*>     Event interface"
 		echo
 	fi
-	if use hal ; then
-		elog "If you want to modify Synaptics settings, please create an fdi file in:"
-		elog "/etc/hal/fdi/policy/"
-		echo
-		ewarn "The current default are set by :"
-		ewarn "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
-		ewarn "You can use this file for inspiration, but DO NOT EDIT IT directly."
-	fi
 }