Cleaning up how synaptics driver is done.

4 files changed, 97 insertions, 89 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 92a19bc40613..a43b9239b46a 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.195 2003/10/05 08:45:11 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.196 2003/10/05 23:58:32 spyderous Exp $
+
+  05 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild,
+  files/synaptics-makefile-fixup-0.11.3p11.patch:
+  Cleaning up how synaptics driver is done.
 
   05 Oct 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r2.ebuild:
   added hardened-gcc exclusion CC, hcc compiles okay but at startup font and lib
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 176331734b83..cb378115f6ab 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,105 +1,106 @@
-MD5 69f6ac0a840908e2a924f7ab00553104 xfree-4.3.99.12.ebuild 31941
+MD5 e691d489351df85042cbbe8be26aa4a1 ChangeLog 44048
+MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
 MD5 d1ee4ee801fe27008bcb498ff5076621 xfree-4.1.0-r6.ebuild 2939
-MD5 06ed9fa7b8e13efd8314f7514086c21c xfree-4.3.0-r2.ebuild 31454
+MD5 2e730b1127a59eabfc864b23049418d6 xfree-4.2.0-r12.ebuild 10299
+MD5 e01435598f0611dafe440192d953b222 xfree-4.2.1-r2.ebuild 24143
 MD5 c804610d686f931303be2e3b6fbd64d7 xfree-4.3.0-r1.ebuild 25077
+MD5 06ed9fa7b8e13efd8314f7514086c21c xfree-4.3.0-r2.ebuild 31454
+MD5 ae7ba2825fc008113b279003129f2875 xfree-4.3.0-r3.ebuild 34022
+MD5 69f6ac0a840908e2a924f7ab00553104 xfree-4.3.99.12.ebuild 31941
 MD5 85e497fca614f216c0f5cbf646e06c0a xfree-4.3.99.13.ebuild 32007
-MD5 e01435598f0611dafe440192d953b222 xfree-4.2.1-r2.ebuild 24143
-MD5 232c74b0c9079da4439df79645376a05 xfree-4.3.0-r3.ebuild 34188
-MD5 3108a3fdc78478adc6e15f063c104b57 ChangeLog 43871
-MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 2e730b1127a59eabfc864b23049418d6 xfree-4.2.0-r12.ebuild 10299
+MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
+MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
-MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
+MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
 MD5 373ecdb2a152d8f047a7f08dffdc40af files/digest-xfree-4.2.1-r2 1267
 MD5 be43a94caab2339e3a00372906f115a0 files/digest-xfree-4.3.0-r1 1384
 MD5 99571ab50326492501cdb59ecb055fa4 files/digest-xfree-4.3.0-r2 1928
 MD5 7368a368c51bff8f9211f27e6f2376b2 files/digest-xfree-4.3.0-r3 2158
-MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
-MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
-MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
 MD5 119d37ee6d742244b4628cb92d99e4ac files/digest-xfree-4.3.99.12 1394
 MD5 dc89d76d80af0a365ebcc6676bcc22e6 files/digest-xfree-4.3.99.13 1394
-MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
+MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
+MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
+MD5 85d5db6f90d920c89d4241472d777b29 files/synaptics-makefile-fixup-0.11.3p11.patch 283
+MD5 027d2f93b478a1c419b8aee64ab2914b files/4.1.0-r6/XftConfig 2002
+MD5 0e3eb0ef30faacadc0372721d57c51f3 files/4.1.0-r6/10xfree 113
+MD5 e110b49a8eef223cbdb65b1ff0ac27c8 files/4.1.0-r6/Xsession 986
+MD5 771ae94bc02c664f7359a5fd6d03893d files/4.1.0-r6/site.def 547
+MD5 bae1bbaf9d55f072280a213e4dc6774f files/4.1.0-r6/xdm 140
+MD5 b287a92cc60a2aefbee8eb1c4d94ca1f files/4.1.0-r6/xdm.start 1149
+MD5 b4c672fdbc5bb1f0781ed462a202b5d0 files/4.1.0-r6/xfs.config 1359
+MD5 a97152f2107f1b91578fd132190728a1 files/4.1.0-r6/xfs.start 796
+MD5 544616dc02a17935af89c0678c7b98c6 files/4.1.0-r6/xinitrc 800
+MD5 20881e1b0f806d9aa31ad984dd1119b8 files/4.2.0/XFree-4.2.0-imake-tmpdir.patch.bz2 541
 MD5 b773eac8dfed3855039201ebebc1fe70 files/4.2.0/XFree86-4.2.0-GeForce2Go.patch.bz2 16409
-MD5 9471f5a22f1b43f75f7c92054192d904 files/4.2.0/XFree86-4.2.0-xft-leak.patch.bz2 423
-MD5 a1e2e9ce27b67b046b9bfe24febe581a files/4.2.0/XFree86-4.2.0-r128-lockup.patch.bz2 344
+MD5 538dbb9b455d9af362bd3b6a861c7592 files/4.2.0/XFree86-4.2.0-Suse-Updates.patch.bz2 120895
 MD5 4bfce8fd172c43edba64d0ca2a7c2859 files/4.2.0/XFree86-4.2.0-agpgart-load.patch.bz2 377
+MD5 b9700cd4fe0b82a0148c329d8c7c0bc7 files/4.2.0/XFree86-4.2.0-fixkbd.patch.bz2 2302
+MD5 2c016cd377d2743d7912550ae0f1bbe9 files/4.2.0/XFree86-4.2.0-i18n.patch.bz2 5029
 MD5 8c8a182fb87437e2c349f2310657c9fe files/4.2.0/XFree86-4.2.0-i810-dri.patch.bz2 373
-MD5 538dbb9b455d9af362bd3b6a861c7592 files/4.2.0/XFree86-4.2.0-Suse-Updates.patch.bz2 120895
 MD5 bbfd4878d1572717afeeee8ca421d0d3 files/4.2.0/XFree86-4.2.0-i810_i845_20020524.patch.bz2 7093
+MD5 a1e2e9ce27b67b046b9bfe24febe581a files/4.2.0/XFree86-4.2.0-r128-lockup.patch.bz2 344
 MD5 6181d7161c3c58d9c3f80a9dcca7873e files/4.2.0/XFree86-4.2.0-v4l.patch.bz2 1201
-MD5 b9700cd4fe0b82a0148c329d8c7c0bc7 files/4.2.0/XFree86-4.2.0-fixkbd.patch.bz2 2302
-MD5 20881e1b0f806d9aa31ad984dd1119b8 files/4.2.0/XFree-4.2.0-imake-tmpdir.patch.bz2 541
-MD5 2c016cd377d2743d7912550ae0f1bbe9 files/4.2.0/XFree86-4.2.0-i18n.patch.bz2 5029
-MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
-MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
-MD5 5002823053814f70a5fa568beee80aed files/4.3.0/Xsetup_0 866
-MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
-MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
-MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
-MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
-MD5 10279070c11de97f1b61ec707676ec37 files/4.3.0/startDM.sh 901
-MD5 df994262f837448b346405eb7b7a997c files/4.3.0/xdm.start 2853
-MD5 a29418c10f780d4bfebbd346be495c43 files/4.3.0/xfs.start 6661
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
-MD5 d0cb338160e3be8790524af8071cc4df files/4.2.0-r12/xdm 380
-MD5 95b2d8e75bfe3ea64d61a42481cbe61f files/4.2.0-r12/xinitrc 918
+MD5 9471f5a22f1b43f75f7c92054192d904 files/4.2.0/XFree86-4.2.0-xft-leak.patch.bz2 423
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.0-r12/XftConfig 7750
+MD5 58fd7e06e4f838fd972399c28a365be1 files/4.2.0-r12/10xfree 144
 MD5 c790204c66b659a34ed3cce3c65fe740 files/4.2.0-r12/Xsession 1357
 MD5 5002823053814f70a5fa568beee80aed files/4.2.0-r12/Xsetup_0 866
-MD5 815f64aac0eec83b9b1bfebd2987d4f2 files/4.2.0-r12/xft-quality.diff 1368
-MD5 0b9ba153a9867601b0d2f874a9a899e4 files/4.2.0-r12/site.def 1540
-MD5 467153debe426cb693f35d66ff493f73 files/4.2.0-r12/xfs.conf.d 521
-MD5 96d721e255fad889a2a72ccfff5dc14c files/4.2.0-r12/xfs.config 1432
 MD5 429888e61c7c6a055bb8d8a249e8f058 files/4.2.0-r12/chooser.sh 1734
+MD5 0b9ba153a9867601b0d2f874a9a899e4 files/4.2.0-r12/site.def 1540
 MD5 761a27c21b936f1a89323eb6ec13cbfb files/4.2.0-r12/startDM.sh 605
+MD5 d0cb338160e3be8790524af8071cc4df files/4.2.0-r12/xdm 380
 MD5 16270023fb31cfad7ff0c6a62c1e295e files/4.2.0-r12/xdm.start 2843
+MD5 467153debe426cb693f35d66ff493f73 files/4.2.0-r12/xfs.conf.d 521
+MD5 96d721e255fad889a2a72ccfff5dc14c files/4.2.0-r12/xfs.config 1432
 MD5 9b9b3dea63aa4c2939a085ee5c7e3922 files/4.2.0-r12/xfs.start 1019
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.0-r12/XftConfig 7750
-MD5 58fd7e06e4f838fd972399c28a365be1 files/4.2.0-r12/10xfree 144
-MD5 bae1bbaf9d55f072280a213e4dc6774f files/4.1.0-r6/xdm 140
-MD5 544616dc02a17935af89c0678c7b98c6 files/4.1.0-r6/xinitrc 800
-MD5 e110b49a8eef223cbdb65b1ff0ac27c8 files/4.1.0-r6/Xsession 986
-MD5 771ae94bc02c664f7359a5fd6d03893d files/4.1.0-r6/site.def 547
-MD5 b4c672fdbc5bb1f0781ed462a202b5d0 files/4.1.0-r6/xfs.config 1359
-MD5 b287a92cc60a2aefbee8eb1c4d94ca1f files/4.1.0-r6/xdm.start 1149
-MD5 a97152f2107f1b91578fd132190728a1 files/4.1.0-r6/xfs.start 796
-MD5 027d2f93b478a1c419b8aee64ab2914b files/4.1.0-r6/XftConfig 2002
-MD5 0e3eb0ef30faacadc0372721d57c51f3 files/4.1.0-r6/10xfree 113
-MD5 bd912edd0e5a73b29305374ed988216a files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 3446
-MD5 31541a840d9412b73f0e759f650efb57 files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 896
-MD5 0989e2d6a78afc18a4e17243c4eb9a7a files/4.2.1-patches/019_all_4.2.0-ati-radeon-pci-drm-enable.patch.bz2 659
+MD5 815f64aac0eec83b9b1bfebd2987d4f2 files/4.2.0-r12/xft-quality.diff 1368
+MD5 95b2d8e75bfe3ea64d61a42481cbe61f files/4.2.0-r12/xinitrc 918
 MD5 8d524f120fa5c2e49ccc8f989d50907c files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 4651
-MD5 55ffb69e24966e208cbc32e5e97a6f09 files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 133585
+MD5 0989e2d6a78afc18a4e17243c4eb9a7a files/4.2.1-patches/019_all_4.2.0-ati-radeon-pci-drm-enable.patch.bz2 659
 MD5 888975c53177c889bf161c7c6ca1134e files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 338
+MD5 55ffb69e24966e208cbc32e5e97a6f09 files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 133585
+MD5 31541a840d9412b73f0e759f650efb57 files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 896
+MD5 bd912edd0e5a73b29305374ed988216a files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 3446
 MD5 a42f86c7c3c0eb01316bd325e07f25a9 files/4.2.1-patches/094_all_4.2.1-Xft1-Imake-config.patch.bz2 1288
-MD5 4485c7fa46907db803d219218f62a5df files/4.2.1-r2/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.2.1-r2/xserver.pamd 284
+MD5 8c48b242627d1157afa04fb6af06f2ca files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 20913
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.2.1-r2/10xfree 182
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.1-r2/XftConfig 7750
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.2.1-r2/Xsession 1521
 MD5 5002823053814f70a5fa568beee80aed files/4.2.1-r2/Xsetup_0 866
-MD5 ca411cceb6124020fdb07edef6df90eb files/4.2.1-r2/xft-quality.diff 848
+MD5 a4faaaebb9eb237b36c9a55e8bbbf7bc files/4.2.1-r2/chooser.sh 1596
 MD5 bdad7157e991bc78312f7ac6bbc8dbbd files/4.2.1-r2/site.def 3408
-MD5 8c48b242627d1157afa04fb6af06f2ca files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 20913
+MD5 200db00808e991ba97118faa139502be files/4.2.1-r2/startDM.sh 903
 MD5 d0cb338160e3be8790524af8071cc4df files/4.2.1-r2/xdm.pamd 380
+MD5 86fcdca1aaff09ca7358d1a30574f2e8 files/4.2.1-r2/xdm.start 2855
 MD5 58b46611c39b0322c25b234abe3ad10a files/4.2.1-r2/xfs.conf.d 803
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.2.1-r2/xfs.config 1331
-MD5 a4faaaebb9eb237b36c9a55e8bbbf7bc files/4.2.1-r2/chooser.sh 1596
-MD5 200db00808e991ba97118faa139502be files/4.2.1-r2/startDM.sh 903
-MD5 86fcdca1aaff09ca7358d1a30574f2e8 files/4.2.1-r2/xdm.start 2855
 MD5 cb721d66b1b67c88708ce1613648ee1d files/4.2.1-r2/xfs.start 6602
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.1-r2/XftConfig 7750
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.2.1-r2/10xfree 182
-MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
-MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
-MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.2.0-r12/lib/libOSMesa.la 788
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.2.0-r12/lib/libGLU.la 769
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.2.0-r12/lib/libGL.la 777
+MD5 ca411cceb6124020fdb07edef6df90eb files/4.2.1-r2/xft-quality.diff 848
+MD5 4485c7fa46907db803d219218f62a5df files/4.2.1-r2/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.2.1-r2/xserver.pamd 284
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
+MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
+MD5 5002823053814f70a5fa568beee80aed files/4.3.0/Xsetup_0 866
+MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
+MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
+MD5 10279070c11de97f1b61ec707676ec37 files/4.3.0/startDM.sh 901
+MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
+MD5 df994262f837448b346405eb7b7a997c files/4.3.0/xdm.start 2853
+MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
+MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
+MD5 a29418c10f780d4bfebbd346be495c43 files/4.3.0/xfs.start 6661
+MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.2.0-r12/Sessions/Xsession 2187
-MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.2.1-r2/lib/libOSMesa.la 788
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.2.1-r2/lib/libGLU.la 769
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.2.1-r2/lib/libGL.la 777
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.2.0-r12/lib/libGL.la 777
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.2.0-r12/lib/libGLU.la 769
+MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.2.0-r12/lib/libOSMesa.la 788
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.2.1-r2/Sessions/Xsession 2187
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.2.1-r2/lib/libGL.la 777
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.2.1-r2/lib/libGLU.la 769
+MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.2.1-r2/lib/libOSMesa.la 788
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
diff --git a/x11-base/xfree/files/synaptics-makefile-fixup-0.11.3p11.patch b/x11-base/xfree/files/synaptics-makefile-fixup-0.11.3p11.patch
new file mode 100644
index 000000000000..a0eaf4835e29
--- /dev/null
+++ b/x11-base/xfree/files/synaptics-makefile-fixup-0.11.3p11.patch
@@ -0,0 +1,8 @@
+--- synaptics/Makefile.orig	2003-07-15 02:34:57.000000000 -0500
++++ synaptics/Makefile	2003-07-15 02:35:15.000000000 -0500
+@@ -1,4 +1,4 @@
+-TOP = /usr/src/redhat/BUILD/XFree86-4.2.0/xc
++TOP = ${S}
+ XTOP = $(TOP)
+ BUILDINCROOT = $(TOP)/exports
+ EXTINCSRC = $(XTOP)/include/extensions
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index e56f26fc9286..4248a75f9959 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.56 2003/10/01 17:53:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.57 2003/10/05 23:58:32 spyderous Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -10,7 +10,7 @@ IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam"
 
 filter-flags "-funroll-loops"
 
-ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O2 -O3 -pipe"
+ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe"
 
 # Recently there has been a lot of stability problem in Gentoo-land.  Many
 # things can be the cause to this, but I believe that it is due to gcc3
@@ -44,8 +44,7 @@ SISDRV_VER="100803-1"
 SAVDRV_VER="1.1.27t"
 MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"
-SYNDRV_VER="0.11.3"
-SYNUPDATE_VER="p11"
+SYNDRV_VER="0.11.7"
 
 BASE_PV="${PV}"
 MY_SV="${BASE_PV//\.}"
@@ -62,7 +61,7 @@ X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/XFree86-${PV}-patche
 X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
 	http://www.probo.com/timr/savage-${SAVDRV_VER}.zip
 	http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz
-	http://tuxmobil.org/software/synaptics/synaptics-${SYNDRV_VER}.tar.gz"
+	http://w1.894.telia.com/~u89404340/touchpad/synaptics-${SYNDRV_VER}.tar.bz2"
 #	mirror://gentoo/XFree86-4.3.0-drivers-via-${VIADRV_VER}.tar.bz2"
 #	ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_1_3_0/mga-${MGADRV_VER}.tgz"
 #	3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )"
@@ -108,8 +107,6 @@ SRC_URI="${SRC_URI}
 	mirror://gentoo/XFree86-locale.alias.bz2
 	mirror://gentoo/XFree86-locale.dir.bz2
 	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2
-	mirror://gentoo/XFree86-synaptics-fixup-${SYNDRV_VER}.diff
-	mirror://gentoo/XFree86-synaptics-update-${SYNDRV_VER}${SYNUPDATE_VER}.diff
 	truetype? ( ${MS_FONT_URLS} )"
 
 LICENSE="X11 MSttfEULA"
@@ -199,9 +196,10 @@ src_unpack() {
 
 	ebegin "Adding Synaptics touchpad driver"
 	cd ${WORKDIR}
-	tar -zxf ${DISTDIR}/synaptics-${SYNDRV_VER}.tar.gz || die
-	cd ${S}
+	tar -jxf ${DISTDIR}/synaptics-${SYNDRV_VER}.tar.bz2 || die
 	eend 0
+	epatch ${FILESDIR}/XFree86-synaptics-fixup-0.11.3p11.diff
+	cd ${S}
 
 #	ebegin "Adding VIA driver"
 #	cd ${WORKDIR}
@@ -265,12 +263,6 @@ src_unpack() {
 
 	unset EPATCH_EXCLUDE
 
-	# Set up Synaptics Makefile
-	cd ${WORKDIR}
-	epatch ${DISTDIR}/XFree86-synaptics-update-${SYNDRV_VER}${SYNUPDATE_VER}.diff
-	cd ${SYNDIR}
-	epatch ${DISTDIR}/XFree86-synaptics-fixup-${SYNDRV_VER}.diff
-
 	# Fix DRI related problems
 	cd ${S}/programs/Xserver/hw/xfree86/
 	epatch ${DISTDIR}/xfree86-dri-resume-v8.patch
@@ -1155,12 +1147,15 @@ pkg_postinst() {
 	einfo
 	ewarn "New in this release: if you wish to set system-wide default"
 	ewarn "cursors, please set them in /usr/local/share/cursors/xfree"
-	ewarn "so that future emerges will not overwrite those settingse"
+	ewarn "so that future emerges will not overwrite those settings"
 	einfo
 	einfo "To use the Synaptics touchpad driver, check the installed"
 	einfo "documentation in /usr/share/doc/xfree, as well as"
 	einfo "http://tuxmobil.org/touchpad_driver.html and"
 	einfo "http://w1.894.telia.com/~u89404340/touchpad/."
+	einfo
+	ewarn "Listening on tcp is disabled by default with startx."
+	ewarn "To enable it, edit /usr/X11R6/bin/startx."
 }
 
 pkg_postrm() {