x11-drivers/xf86-input-synaptics: punt syndaemon init script (see bug #37767)

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

6 files changed, 9 insertions, 44 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index bfb0f8790fac..a9afbc754575 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.27 2009/08/03 17:26:42 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.28 2009/09/16 08:13:52 remi Exp $
+
+  16 Sep 2009; Rémi Cardona <remi@gentoo.org>
+  xf86-input-synaptics-1.0.0.ebuild, xf86-input-synaptics-1.1.2.ebuild,
+  xf86-input-synaptics-1.1.3.ebuild, -files/rc.conf, -files/rc.init:
+  punt syndaemon init script (see bug #37767)
 
 *xf86-input-synaptics-1.1.3 (03 Aug 2009)
 
diff --git a/x11-drivers/xf86-input-synaptics/files/rc.conf b/x11-drivers/xf86-input-synaptics/files/rc.conf
deleted file mode 100644
index d141d0c1d27f..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/rc.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2003 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/files/rc.conf,v 1.1 2008/08/22 17:09:35 chainsaw Exp $
-
-# Config file for /etc/init.d/syndaemon
-
-# run `syndaemon --help` for valid cmdline options
-#SYNDAEMON_OPTS=""
diff --git a/x11-drivers/xf86-input-synaptics/files/rc.init b/x11-drivers/xf86-input-synaptics/files/rc.init
deleted file mode 100644
index 3ab67e88abe2..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/rc.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/files/rc.init,v 1.1 2008/08/22 17:09:35 chainsaw Exp $
-
-depend() {
-	use localmount
-}
-
-start() {
-	ebegin "Starting syndaemon"
-	/usr/bin/syndaemon ${SYNDAEMON_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping syndaemon"
-	kill `cat /var/run/syndaemon.pid`
-	eend $?
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
index 69830f075cdd..ad9679148940 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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-synaptics/xf86-input-synaptics-1.0.0.ebuild,v 1.6 2009/04/05 22:12:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild,v 1.7 2009/09/16 08:13:53 remi Exp $
 
 inherit toolchain-funcs eutils x-modular
 
@@ -21,10 +21,6 @@ src_install() {
 	DOCS="INSTALL NEWS TODO README"
 	x-modular_src_install
 
-	# Stupid new daemon, didn't work for me because of shm issues
-	newinitd "${FILESDIR}"/rc.init syndaemon
-	newconfd "${FILESDIR}"/rc.conf syndaemon
-
 	if use hal ; then
 		insinto /usr/share/hal/fdi/policy/10osvendor
 		doins "${S}"/fdi/11-x11-synaptics.fdi
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.2.ebuild
index 460d017795da..f3c722e4bafb 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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-synaptics/xf86-input-synaptics-1.1.2.ebuild,v 1.1 2009/06/01 23:22:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.2.ebuild,v 1.2 2009/09/16 08:13:53 remi Exp $
 
 inherit toolchain-funcs eutils x-modular
 
@@ -24,10 +24,6 @@ src_install() {
 	DOCS="INSTALL NEWS TODO README"
 	x-modular_src_install
 
-	# Stupid new daemon, didn't work for me because of shm issues
-	newinitd "${FILESDIR}"/rc.init syndaemon
-	newconfd "${FILESDIR}"/rc.conf syndaemon
-
 	if use hal ; then
 		insinto /usr/share/hal/fdi/policy/10osvendor
 		doins "${S}"/fdi/11-x11-synaptics.fdi
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild
index 5d3acaa263d2..d37b5a2b0ce6 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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-synaptics/xf86-input-synaptics-1.1.3.ebuild,v 1.1 2009/08/03 17:26:42 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.1.3.ebuild,v 1.2 2009/09/16 08:13:52 remi Exp $
 
 inherit toolchain-funcs eutils x-modular
 
@@ -24,10 +24,6 @@ src_install() {
 	DOCS="INSTALL NEWS TODO README"
 	x-modular_src_install
 
-	# Stupid new daemon, didn't work for me because of shm issues
-	newinitd "${FILESDIR}"/rc.init syndaemon
-	newconfd "${FILESDIR}"/rc.conf syndaemon
-
 	if use hal ; then
 		insinto /usr/share/hal/fdi/policy/10osvendor
 		doins "${S}"/fdi/11-x11-synaptics.fdi