Modified Gentoo patch and init script and closing bug #77274.

5 files changed, 13 insertions, 87 deletions

diff --git a/x11-misc/mkxf86config/ChangeLog b/x11-misc/mkxf86config/ChangeLog
index f5d6db2b079b..a5227cbbd809 100644
--- a/x11-misc/mkxf86config/ChangeLog
+++ b/x11-misc/mkxf86config/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2004/12/31 15:43:18 wolf31o2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/ChangeLog,v 1.14 2005/01/12 13:52:35 wolf31o2 Exp $
+
+  12 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/mkxf86config-0.8-gentoo.patch, -files/mkxf86config-gentoo.patch,
+  files/mkxf86config-init:
+  Modified Gentoo patch and init script and closing bug #77274.
 
   31 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   files/mkxf86config-0.8-gentoo.patch, -mkxf86config-0.8-r2.ebuild:
diff --git a/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch b/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch
index d4b111f5c29f..2b1e2c7198d8 100644
--- a/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch
+++ b/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch
@@ -191,7 +191,7 @@ diff -urN xf86config-knoppix-0.8.old/mkxf86config.sh xf86config-knoppix-0.8/mkxf
 +	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")
++		SYNDEV=/dev/input/$(cat /proc/bus/input/devices | egrep -i -A 5 "^N: .*synaptics.*" | grep Handlers | sed -r "s/.*(event[0-9]+).*/\1/g")
 +		SYNMOUSE=""
 +	else
 +		SYNMOUSE='s|^.*InputDevice.*"Synaptics".*$|#No Synaptics touchpad found|g;'
diff --git a/x11-misc/mkxf86config/files/mkxf86config-gentoo.patch b/x11-misc/mkxf86config/files/mkxf86config-gentoo.patch
deleted file mode 100644
index 5816ba25c534..000000000000
--- a/x11-misc/mkxf86config/files/mkxf86config-gentoo.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ruN xf86config-knoppix-0.8-orig/XF86Config-4.in xf86config-knoppix-0.8/XF86Config-4.in
---- xf86config-knoppix-0.8-orig/XF86Config-4.in	2004-01-03 17:22:59.691440216 +0000
-+++ xf86config-knoppix-0.8/XF86Config-4.in	2004-01-03 17:24:49.111805792 +0000
-@@ -13,30 +13,14 @@
- EndSection
- 
- Section "Files"
--	RgbPath      "/usr/X11R6/lib/X11/rgb"
--	ModulePath   "/usr/X11R6/lib/modules"
--	FontPath     "/usr/X11R6/lib/X11/fonts/misc:unscaled"
--	FontPath     "/usr/X11R6/lib/X11/fonts/misc"
--	FontPath     "/usr/X11R6/lib/X11/fonts/75dpi:unscaled"
--	FontPath     "/usr/X11R6/lib/X11/fonts/75dpi"
--	FontPath     "/usr/X11R6/lib/X11/fonts/100dpi:unscaled"
--	FontPath     "/usr/X11R6/lib/X11/fonts/100dpi"
--	FontPath     "/usr/X11R6/lib/X11/fonts/Speedo"
--	FontPath     "/usr/X11R6/lib/X11/fonts/PEX"
--# Additional fonts: Locale, Gimp, TTF...
--	FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic"
--#	FontPath     "/usr/X11R6/lib/X11/fonts/latin2/75dpi"
--#	FontPath     "/usr/X11R6/lib/X11/fonts/latin2/100dpi"
--# True type and type1 fonts are also handled via xftlib, see /etc/X11/XftConfig!
--	FontPath     "/usr/X11R6/lib/X11/fonts/Type1"
--	FontPath     "/usr/share/fonts/ttf/western"
--	FontPath     "/usr/share/fonts/ttf/decoratives"
--	FontPath     "/usr/share/fonts/truetype"
--	FontPath     "/usr/share/fonts/truetype/openoffice"
--	FontPath     "/usr/share/fonts/truetype/ttf-bitstream-vera"
--	FontPath     "/usr/share/fonts/latex-ttf-fonts"
--	FontPath     "/usr/X11R6/lib/X11/fonts/defoma/CID"
--	FontPath     "/usr/X11R6/lib/X11/fonts/defoma/TrueType"
-+        RgbPath      "/usr/X11R6/lib/X11/rgb"
-+        ModulePath   "/usr/X11R6/lib/modules"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/misc/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/Speedo/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/Type1/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/CID/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/75dpi/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi/"
- EndSection
- 
- Section "Module"
-diff -ruN xf86config-knoppix-0.8-orig/XF86Config.in xf86config-knoppix-0.8/XF86Config.in
---- xf86config-knoppix-0.8-orig/XF86Config.in	2004-01-03 17:22:59.692440064 +0000
-+++ xf86config-knoppix-0.8/XF86Config.in	2004-01-03 17:25:26.954052896 +0000
-@@ -1,27 +1,11 @@
- Section "Files"
--        RgbPath      "/usr/X11R6/lib/X11/rgb"
--        FontPath     "/usr/X11R6/lib/X11/fonts/misc:unscaled"
--        FontPath     "/usr/X11R6/lib/X11/fonts/misc"
--        FontPath     "/usr/X11R6/lib/X11/fonts/75dpi:unscaled"
--        FontPath     "/usr/X11R6/lib/X11/fonts/75dpi"
--        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi:unscaled"
--        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi"
--        FontPath     "/usr/X11R6/lib/X11/fonts/Speedo"
--        FontPath     "/usr/X11R6/lib/X11/fonts/PEX"
--# Additional fonts: Locale, Gimp, TTF...
--        FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic"
--#        FontPath     "/usr/X11R6/lib/X11/fonts/latin2/75dpi"
--#        FontPath     "/usr/X11R6/lib/X11/fonts/latin2/100dpi"
--# True type and type1 fonts are also handled via xftlib, see /etc/X11/XftConfig!
--	FontPath     "/usr/X11R6/lib/X11/fonts/Type1"
--        FontPath     "/usr/share/fonts/ttf/western"
--        FontPath     "/usr/share/fonts/ttf/decoratives"
--	FontPath     "/usr/share/fonts/truetype"
--        FontPath     "/usr/share/fonts/truetype/openoffice"
--        FontPath     "/usr/share/fonts/truetype/ttf-bitstream-vera"
--	FontPath     "/usr/share/fonts/latex-ttf-fonts"
--        FontPath     "/usr/X11R6/lib/X11/fonts/defoma/CID"
--        FontPath     "/usr/X11R6/lib/X11/fonts/defoma/TrueType"
-+        ModulePath   "/usr/X11R6/lib/modules"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/misc/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/Speedo/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/Type1/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/CID/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/75dpi/"
-+        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi/"
- EndSection
- 
- Section "ServerFlags"
diff --git a/x11-misc/mkxf86config/files/mkxf86config-init b/x11-misc/mkxf86config/files/mkxf86config-init
index 3408d3fd09bf..7f4be63069a0 100644
--- a/x11-misc/mkxf86config/files/mkxf86config-init
+++ b/x11-misc/mkxf86config/files/mkxf86config-init
@@ -1,10 +1,11 @@
 #!/sbin/runscript
  
 depend() {
-    need
+    before local
 }
  
 start() {
-    ebegin "Create XF86Config"
+    ebegin "Creating X Configuration"
     /usr/sbin/mkxf86config.sh
+	eend $?
 }
diff --git a/x11-misc/mkxf86config/mkxf86config-0.8-r3.ebuild b/x11-misc/mkxf86config/mkxf86config-0.8-r3.ebuild
index 1e2321e5e022..e1429140c702 100644
--- a/x11-misc/mkxf86config/mkxf86config-0.8-r3.ebuild
+++ b/x11-misc/mkxf86config/mkxf86config-0.8-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.8-r3.ebuild,v 1.3 2004/10/19 09:04:44 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.8-r3.ebuild,v 1.4 2005/01/12 13:52:35 wolf31o2 Exp $
 
 inherit eutils