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

diff --git a/x11-misc/mkxf86config/ChangeLog b/x11-misc/mkxf86config/ChangeLog
index f5d6db2b079b3b6ff056818da464c7340bf18b11..a5227cbbd809a87935e7c0b37c6b14a98cfcb10b 100644 (file)
--- 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/Manifest b/x11-misc/mkxf86config/Manifest
index 351af16ea88ffee119ceb85a8970474f8923f24f..47eacebeeb101561186e0d5e07e9b48b9631f4a8 100644 (file)
--- a/x11-misc/mkxf86config/Manifest
+++ b/x11-misc/mkxf86config/Manifest
@@ -1,7 +1,6 @@
-MD5 3de9683ec7e7cf0e986acca7aa78dc2f mkxf86config-0.8-r3.ebuild 1006
-MD5 f8faec60b49e22b2ba66d1491bf19a38 ChangeLog 2206
+MD5 e50f0bf45f9cbcfa992b408a9ccb4199 mkxf86config-0.8-r3.ebuild 1006
+MD5 15774f59c1235eccc2bc426f7919257a ChangeLog 2425
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 423b5bc3ee2b6cd634b09a3d671a9031 files/mkxf86config-init 117
+MD5 05ef2a39273eb3078a00d32415313cd9 files/mkxf86config-init 141
 MD5 acb082113f280286835527d735631bfd files/digest-mkxf86config-0.8-r3 74
-MD5 8ebdf9901bd2f9f2a5c4e4ccbfed541c files/mkxf86config-gentoo.patch 4040
-MD5 dc2dd5f9a258bc025d218420c167ecb3 files/mkxf86config-0.8-gentoo.patch 14303
+MD5 db289c2cd67a32e4726683836ac498ad files/mkxf86config-0.8-gentoo.patch 14314

diff --git a/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch b/x11-misc/mkxf86config/files/mkxf86config-0.8-gentoo.patch
index d4b111f5c29f8ed1a000e1cf49edb55bf7be4096..2b1e2c7198d8fb0dc8b90bebeea35a06525f3a74 100644 (file)
--- 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 (file)
index 5816ba2..0000000
--- 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 3408d3fd09bf91977642666776bd606145de0211..7f4be63069a057e2412939a0a93c22530acdb644 100644 (file)
--- 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 1e2321e5e022a2978ea50c7110def02334479b1b..e1429140c702ce9379c6a1b97c19fe70c8727c88 100644 (file)
--- 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