Updated files/mkxf86config-0.8-gentoo.patch with Synaptics support. Thank Robert Paskowitz <rpaskowitz@confucius.ca> for his patch. Closing bug #72382.

4 files changed, 208 insertions, 80 deletions

diff --git a/x11-misc/mkxf86config/ChangeLog b/x11-misc/mkxf86config/ChangeLog
index f9a6203d7380..f5d6db2b079b 100644
--- a/x11-misc/mkxf86config/ChangeLog
+++ b/x11-misc/mkxf86config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/mkxf86config
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/ChangeLog,v 1.12 2004/10/19 09:04:44 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/ChangeLog,v 1.13 2004/12/31 15:43:18 wolf31o2 Exp $
+
+  31 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/mkxf86config-0.8-gentoo.patch, -mkxf86config-0.8-r2.ebuild:
+  Updated files/mkxf86config-0.8-gentoo.patch with Synaptics support. Thank
+  Robert Paskowitz <rpaskowitz@confucius.ca> for his patch. Closing bug
+  #72382.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   mkxf86config-0.8-r3.ebuild:
diff --git a/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r2 b/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r2
deleted file mode 100644
index 5e89d3572f35..000000000000
--- a/x11-misc/mkxf86config/files/digest-mkxf86config-0.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d29fb623c9c33ed3733ab949b4c5c001 xf86config-knoppix_0.8-5.tar.gz 9378
diff --git a/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch b/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch
index edc73fb8f53b..d4b111f5c29f 100644
--- a/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch
+++ b/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch
@@ -1,7 +1,23 @@
-diff -urN xf86config-knoppix-0.8.orig/XF86Config-4.in xf86config-knoppix-0.8/XF86Config-4.in
---- xf86config-knoppix-0.8.orig/XF86Config-4.in	2003-07-25 12:14:56.000000000 -0400
-+++ xf86config-knoppix-0.8/XF86Config-4.in	2004-07-23 23:08:30.978313104 -0400
-@@ -15,14 +15,13 @@
+diff -urN xf86config-knoppix-0.8.old/XF86Config-4.in xf86config-knoppix-0.8/XF86Config-4.in
+--- xf86config-knoppix-0.8.old/XF86Config-4.in	2003-07-25 12:14:56.000000000 -0400
++++ xf86config-knoppix-0.8/XF86Config-4.in	2004-12-31 10:34:05.409819136 -0500
+@@ -1,10 +1,11 @@
+ Section "ServerLayout"
+-	Identifier     "XFree86 Configured"
++	Identifier     "X.Org Configured"
+ 	Screen      0  "Screen0" 0 0
+ 	InputDevice    "Keyboard0" "CoreKeyboard"
+-	InputDevice    "PS/2 Mouse" "CorePointer"
+-	InputDevice    "Serial Mouse" "CorePointer"
+-        InputDevice    "USB Mouse" "CorePointer"
++	InputDevice    "PS/2 Mouse" "AlwaysCore"
++	InputDevice    "Serial Mouse" "AlwaysCore"
++	InputDevice    "USB Mouse" "AlwaysCore"
++	InputDevice    "Synaptics" "AlwaysCore"
+ EndSection
+ 
+ Section "ServerFlags"
+@@ -15,14 +16,13 @@
  Section "Files"
  	RgbPath      "/usr/X11R6/lib/X11/rgb"
  	ModulePath   "/usr/X11R6/lib/modules"
@@ -23,7 +39,7 @@ diff -urN xf86config-knoppix-0.8.orig/XF86Config-4.in xf86config-knoppix-0.8/XF8
  # Additional fonts: Locale, Gimp, TTF...
  	FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic"
  #	FontPath     "/usr/X11R6/lib/X11/fonts/latin2/75dpi"
-@@ -35,8 +34,8 @@
+@@ -35,18 +35,18 @@
  	FontPath     "/usr/share/fonts/truetype/openoffice"
  	FontPath     "/usr/share/fonts/truetype/ttf-bitstream-vera"
  	FontPath     "/usr/share/fonts/latex-ttf-fonts"
@@ -34,9 +50,112 @@ diff -urN xf86config-knoppix-0.8.orig/XF86Config-4.in xf86config-knoppix-0.8/XF8
  EndSection
  
  Section "Module"
-diff -urN xf86config-knoppix-0.8.orig/mkxf86config.sh xf86config-knoppix-0.8/mkxf86config.sh
---- xf86config-knoppix-0.8.orig/mkxf86config.sh	2004-02-20 07:59:28.000000000 -0500
-+++ xf86config-knoppix-0.8/mkxf86config.sh	2004-07-23 23:10:13.494728240 -0400
+-        Load  "ddc"  # ddc probing of monitor
++    Load  "ddc"  # ddc probing of monitor
+ 	Load  "GLcore"
+ 	Load  "dbe"
+ 	Load  "dri"
+ 	Load  "extmod"
+ 	Load  "glx"
+-        Load  "bitmap" # bitmap-fonts
++	Load  "bitmap" # bitmap-fonts
+ 	Load  "speedo"
+ 	Load  "type1"
+ 	Load  "freetype"
+@@ -56,10 +56,10 @@
+ Section "InputDevice"
+ 	Identifier  "Keyboard0"
+ 	Driver      "keyboard"
+-        Option      "CoreKeyboard"
++	Option      "CoreKeyboard"
+ 	Option "XkbRules" "xfree86"
+ 	Option "XkbModel" "pc105"
+-	Option "XkbLayout" "de"
++	Option "XkbLayout" "en"
+ 	Option "XkbVariant" "nodeadkeys"
+ EndSection
+ 
+@@ -76,21 +76,41 @@
+ Section "InputDevice"
+ 	Identifier  "PS/2 Mouse"
+ 	Driver      "mouse"
+-	Option      "Protocol" "PS/2"
+-	Option      "Device" "/dev/psaux"
++	Option      "Protocol" "IMPS/2"
++	Option      "Device" "/dev/misc/psaux"
+ 	Option      "Emulate3Buttons" "true"
+ 	Option      "Emulate3Timeout" "70"
+ 	Option	    "SendCoreEvents"  "true"
+ EndSection
+ 
+ Section "InputDevice"
+-        Identifier      "USB Mouse"
+-        Driver          "mouse"
+-        Option          "Device"                "/dev/input/mice"
+-	Option		"SendCoreEvents"	"true"
+-        Option          "Protocol"              "IMPS/2"
+-        Option          "ZAxisMapping"          "4 5"
+-        Option          "Buttons"               "5"
++	Identifier  "USB Mouse"
++	Driver      "mouse"
++	Option      "Device" "/dev/input/mice"
++	Option      "SendCoreEvents" "true"
++	Option      "Protocol" "IMPS/2"
++	Option      "ZAxisMapping" "4 5"
++    Option      "Buttons" "5"
++EndSection
++
++Section "InputDevice"
++	Identifier  "Synaptics"
++	Driver      "synaptics"
++	Option      "Protocol" "event"
++	Option      "Device" "@@SYNDEV@@"
++	Option      "LeftEdge" "1900"
++	Option      "RightEdge" "5400"
++	Option      "TopEdge" "1900"
++	Option      "BottomEdge" "4000"
++	Option      "FingerLow" "25"
++	Option      "FingerHigh" "30"
++	Option      "MaxTapTime" "180"
++	Option      "MaxTapMove" "220"
++	Option      "VertScrollDelta" "100"
++	Option      "MinSpeed" "0.02"
++	Option      "MaxSpeed" "0.10"
++	Option      "AccelFactor" "0.0010"
++	Option      "SHMConfig" "on"
+ EndSection
+ 
+ # Auto-generated by KNOPPIX mkxf86config
+@@ -98,7 +118,7 @@
+ 
+ Section "Device"
+ 	### Available Driver options are:-
+-# sw_cursor is needed for some ati and radeon cards
++        # sw_cursor is needed for some ati and radeon cards
+         #Option     "sw_cursor"
+         #Option     "hw_cursor"
+         #Option     "NoAccel"
+@@ -107,7 +127,7 @@
+         #Option     "UseFBDev"
+         #Option     "Rotate"
+ 	Identifier  "Card0"
+-# The following line is auto-generated by KNOPPIX mkxf86config
++	# The following line is auto-generated by KNOPPIX mkxf86config
+ 	Driver      "@@XMODULE@@"
+ 	VendorName  "All"
+ 	BoardName   "All"
+@@ -118,7 +138,7 @@
+ 	Identifier "Screen0"
+ 	Device     "Card0"
+ 	Monitor    "Monitor0"
+-	DefaultColorDepth 16
++	DefaultColorDepth 24
+ 	SubSection "Display"
+ 		Depth     1
+ 		@@MODES@@
+diff -urN xf86config-knoppix-0.8.old/mkxf86config.sh xf86config-knoppix-0.8/mkxf86config.sh
+--- xf86config-knoppix-0.8.old/mkxf86config.sh	2004-02-20 07:59:28.000000000 -0500
++++ xf86config-knoppix-0.8/mkxf86config.sh	2004-12-31 10:21:53.893026592 -0500
 @@ -53,7 +53,7 @@
  
  # Xserver, Xmodule, Xscreen, Xvrefresh, if specified by commandline
@@ -64,7 +183,25 @@ diff -urN xf86config-knoppix-0.8.orig/mkxf86config.sh xf86config-knoppix-0.8/mkx
  # if not already done by hwsetup
  [ -f /etc/sysconfig/mouse ] && . /etc/sysconfig/mouse
  [ -e /dev/mouse ] || ln -sf /dev/ttyS0 /dev/mouse
-@@ -362,8 +362,10 @@
+@@ -346,6 +346,17 @@
+ ;;
+ esac
+ 
++if [ -a /proc/bus/input/devices ]; then
++	CHECK=$(cat /proc/bus/input/devices | grep -i synaptics | wc -l)
++	if [ $CHECK -gt 0 ]; then
++		modprobe evdev
++		SYNDEV=/dev/input/$(cat /proc/bus/input/devices | grep -i -A 5 synaptics | grep Handlers | sed -r "s/.*(event[0-9]+).*/\1/g")
++		SYNMOUSE=""
++	else
++		SYNMOUSE='s|^.*InputDevice.*"Synaptics".*$|#No Synaptics touchpad found|g;'
++	fi
++fi
++
+ # Write Monitor data now
+ rm -f "$MONITORTMP"
+ echo "$MONITOR" >"$MONITORTMP"
+@@ -362,8 +373,10 @@
      /etc/X11/XF86Config.in > /etc/X11/XF86Config
  fi
  
@@ -77,7 +214,14 @@ diff -urN xf86config-knoppix-0.8.orig/mkxf86config.sh xf86config-knoppix-0.8/mkx
  
  # VMWare special handling
  VMWARE=""
-@@ -396,10 +398,26 @@
+@@ -391,15 +404,33 @@
+     -e '/@@MONITOR@@/r '"$MONITORTMP" \
+     -e 's|@@MONITOR@@||g' \
+     -e 's|@@NOPM@@|'"$NOPM"'|g' \
+-    -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL" \
++    -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL""$SYNMOUSE" \
++	-e 's|@@SYNDEV@@|'"$SYNDEV"'|g' \
+     -e 's|@@MODES@@|'"$MODES"'|g;'"$DEPTH" \
      -e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"$XKEYBOARD"'"|g;'"$DEADKEYS" \
      /etc/X11/XF86Config-4.in >/etc/X11/XF86Config-4
  
@@ -85,7 +229,8 @@ diff -urN xf86config-knoppix-0.8.orig/mkxf86config.sh xf86config-knoppix-0.8/mkx
 +    -e '/@@MONITOR@@/r '"$MONITORTMP" \
 +    -e 's|@@MONITOR@@||g' \
 +    -e 's|@@NOPM@@|'"$NOPM"'|g' \
-+    -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL" \
++    -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL""$SYNMOUSE" \
++	-e 's|@@SYNDEV@@|'"$SYNDEV"'|g' \
 +    -e 's|@@MODES@@|'"$MODES"'|g;'"$DEPTH" \
 +    -e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"$XKEYBOARD"'"|g;'"$DEADKEYS" \
 +    /etc/X11/xorg.conf.in >/etc/X11/xorg.conf
@@ -101,22 +246,23 @@ diff -urN xf86config-knoppix-0.8.orig/mkxf86config.sh xf86config-knoppix-0.8/mkx
 +    if [ -f /etc/X11/xorg.conf ]; then
 +        sed -e 's|Identifier[    ]*"Monitor0"|Identifier        "Monitor0"\
 +	'"$DPMS"'|g' /etc/X11/xorg.conf >/etc/X11/xorg.conf.new
-+	mv -f /etc/X11/xorg.conf.new /etc/X11/xorg.conf
++		mv -f /etc/X11/xorg.conf.new /etc/X11/xorg.conf
 +    fi
  fi
  
  fi
-diff -urN xf86config-knoppix-0.8.orig/xorg.conf.in xf86config-knoppix-0.8/xorg.conf.in
---- xf86config-knoppix-0.8.orig/xorg.conf.in	1969-12-31 19:00:00.000000000 -0500
-+++ xf86config-knoppix-0.8/xorg.conf.in	2004-07-23 23:08:30.979312952 -0400
-@@ -0,0 +1,153 @@
+diff -urN xf86config-knoppix-0.8.old/xorg.conf.in xf86config-knoppix-0.8/xorg.conf.in
+--- xf86config-knoppix-0.8.old/xorg.conf.in	1969-12-31 19:00:00.000000000 -0500
++++ xf86config-knoppix-0.8/xorg.conf.in	2004-12-31 10:34:03.351132104 -0500
+@@ -0,0 +1,174 @@
 +Section "ServerLayout"
 +	Identifier     "X.Org Configured"
 +	Screen      0  "Screen0" 0 0
 +	InputDevice    "Keyboard0" "CoreKeyboard"
-+	InputDevice    "PS/2 Mouse" "CorePointer"
-+	InputDevice    "Serial Mouse" "CorePointer"
-+        InputDevice    "USB Mouse" "CorePointer"
++	InputDevice    "PS/2 Mouse" "AlwaysCore"
++	InputDevice    "Serial Mouse" "AlwaysCore"
++	InputDevice    "USB Mouse" "AlwaysCore"
++	InputDevice    "Synaptics" "AlwaysCore"
 +EndSection
 +
 +Section "ServerFlags"
@@ -151,13 +297,13 @@ diff -urN xf86config-knoppix-0.8.orig/xorg.conf.in xf86config-knoppix-0.8/xorg.c
 +EndSection
 +
 +Section "Module"
-+        Load  "ddc"  # ddc probing of monitor
++    Load  "ddc"  # ddc probing of monitor
 +	Load  "GLcore"
 +	Load  "dbe"
 +	Load  "dri"
 +	Load  "extmod"
 +	Load  "glx"
-+        Load  "bitmap" # bitmap-fonts
++	Load  "bitmap" # bitmap-fonts
 +	Load  "speedo"
 +	Load  "type1"
 +	Load  "freetype"
@@ -167,10 +313,10 @@ diff -urN xf86config-knoppix-0.8.orig/xorg.conf.in xf86config-knoppix-0.8/xorg.c
 +Section "InputDevice"
 +	Identifier  "Keyboard0"
 +	Driver      "keyboard"
-+        Option      "CoreKeyboard"
++	Option      "CoreKeyboard"
 +	Option "XkbRules" "xfree86"
 +	Option "XkbModel" "pc105"
-+	Option "XkbLayout" "de"
++	Option "XkbLayout" "en"
 +	Option "XkbVariant" "nodeadkeys"
 +EndSection
 +
@@ -187,21 +333,41 @@ diff -urN xf86config-knoppix-0.8.orig/xorg.conf.in xf86config-knoppix-0.8/xorg.c
 +Section "InputDevice"
 +	Identifier  "PS/2 Mouse"
 +	Driver      "mouse"
-+	Option      "Protocol" "PS/2"
-+	Option      "Device" "/dev/psaux"
++	Option      "Protocol" "IMPS/2"
++	Option      "Device" "/dev/misc/psaux"
 +	Option      "Emulate3Buttons" "true"
 +	Option      "Emulate3Timeout" "70"
 +	Option	    "SendCoreEvents"  "true"
 +EndSection
 +
 +Section "InputDevice"
-+        Identifier      "USB Mouse"
-+        Driver          "mouse"
-+        Option          "Device"                "/dev/input/mice"
-+	Option		"SendCoreEvents"	"true"
-+        Option          "Protocol"              "IMPS/2"
-+        Option          "ZAxisMapping"          "4 5"
-+        Option          "Buttons"               "5"
++	Identifier  "USB Mouse"
++	Driver      "mouse"
++	Option      "Device" "/dev/input/mice"
++	Option      "SendCoreEvents" "true"
++	Option      "Protocol" "IMPS/2"
++	Option      "ZAxisMapping" "4 5"
++    Option      "Buttons" "5"
++EndSection
++
++Section "InputDevice"
++	Identifier  "Synaptics"
++	Driver      "synaptics"
++	Option      "Protocol" "event"
++	Option      "Device" "@@SYNDEV@@"
++	Option      "LeftEdge" "1900"
++	Option      "RightEdge" "5400"
++	Option      "TopEdge" "1900"
++	Option      "BottomEdge" "4000"
++	Option      "FingerLow" "25"
++	Option      "FingerHigh" "30"
++	Option      "MaxTapTime" "180"
++	Option      "MaxTapMove" "220"
++	Option      "VertScrollDelta" "100"
++	Option      "MinSpeed" "0.02"
++	Option      "MaxSpeed" "0.10"
++	Option      "AccelFactor" "0.0010"
++	Option      "SHMConfig" "on"
 +EndSection
 +
 +# Auto-generated by KNOPPIX mkxf86config
@@ -209,7 +375,7 @@ diff -urN xf86config-knoppix-0.8.orig/xorg.conf.in xf86config-knoppix-0.8/xorg.c
 +
 +Section "Device"
 +	### Available Driver options are:-
-+# sw_cursor is needed for some ati and radeon cards
++        # sw_cursor is needed for some ati and radeon cards
 +        #Option     "sw_cursor"
 +        #Option     "hw_cursor"
 +        #Option     "NoAccel"
@@ -218,7 +384,7 @@ diff -urN xf86config-knoppix-0.8.orig/xorg.conf.in xf86config-knoppix-0.8/xorg.c
 +        #Option     "UseFBDev"
 +        #Option     "Rotate"
 +	Identifier  "Card0"
-+# The following line is auto-generated by KNOPPIX mkxf86config
++	# The following line is auto-generated by KNOPPIX mkxf86config
 +	Driver      "@@XMODULE@@"
 +	VendorName  "All"
 +	BoardName   "All"
@@ -229,7 +395,7 @@ diff -urN xf86config-knoppix-0.8.orig/xorg.conf.in xf86config-knoppix-0.8/xorg.c
 +	Identifier "Screen0"
 +	Device     "Card0"
 +	Monitor    "Monitor0"
-+	DefaultColorDepth 16
++	DefaultColorDepth 24
 +	SubSection "Display"
 +		Depth     1
 +		@@MODES@@
diff --git a/x11-misc/mkxf86config/mkxf86config-0.8-r2.ebuild b/x11-misc/mkxf86config/mkxf86config-0.8-r2.ebuild
deleted file mode 100644
index f5b5fd4607a6..000000000000
--- a/x11-misc/mkxf86config/mkxf86config-0.8-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.8-r2.ebuild,v 1.5 2004/06/28 20:06:12 agriffis Exp $
-
-inherit eutils
-
-IUSE="livecd"
-
-MY_PN="xf86config-knoppix"
-MY_PV="${PV}-5"
-MY_P="${MY_PN}_${MY_PV}"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="xf86config setup program"
-SRC_URI="http://developer.linuxtag.net/knoppix/sources/${MY_P}.tar.gz"
-HOMEPAGE="http://www.knopper.net"
-
-KEYWORDS="x86 amd64"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=""
-RDEPEND="sys-apps/hwsetup
-	sys-apps/ddcxinfo-knoppix
-	virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PN}-gentoo.patch
-}
-
-src_install() {
-	dodoc debian/README.Debian debian/changelog debian/control debian/copyright
-	insinto /etc/X11
-	doins XF86Config-4.in XF86Config.in
-	exeinto /usr/sbin
-	doexe mkxf86config.sh
-
-	if use livecd; then
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/mkxf86config-init mkxf86config
-	fi
-}