Fixing broken patches to close bug #24046.

4 files changed, 84 insertions, 211 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 76912ad0ee4a..05753dc15a4e 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
 # 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.179 2003/09/07 01:57:11 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.180 2003/09/07 02:25:28 spyderous Exp $
+
+  06 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild:
+  Fixing broken patches to close bug #24046.
 
   07 Sep 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.3.99.11.ebuild:
   Rather use 'unpack' and not tar, as it already handle the invalid uid/gid
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 9100674a386a..0bc8b27b44c2 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,107 +1,107 @@
-MD5 b5edffe4c64877f950e5b9cc9e6b6dd2 xfree-4.2.1-r2.ebuild 24184
-MD5 30ab90872cc1960dcb87dfe3a37bb704 xfree-4.3.99.9.ebuild 31586
-MD5 cc8893cec16b0a68f380bee66fa307b1 xfree-4.3.0-r2.ebuild 31410
-MD5 b35f68907eb1c04375a133178e01d2a6 xfree-4.3.0-r1.ebuild 25121
-MD5 d85b3b57d951d99d442a818e4a36af65 ChangeLog 40566
-MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 24cdcd01eb1136c73d605f2353336983 xfree-4.3.99.10.ebuild 31058
+MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
+MD5 3afe69de4b96b8fb40a395eac73d0880 xfree-4.2.1-r2.ebuild 24186
+MD5 b35f68907eb1c04375a133178e01d2a6 xfree-4.3.0-r1.ebuild 25121
+MD5 cc8893cec16b0a68f380bee66fa307b1 xfree-4.3.0-r2.ebuild 31410
 MD5 f43f9f652052e4f8bf896a85717d7d33 xfree-4.3.0-r3.ebuild 33940
+MD5 24cdcd01eb1136c73d605f2353336983 xfree-4.3.99.10.ebuild 31058
 MD5 6cded196432edca8ee88917f6fa2c402 xfree-4.3.99.11.ebuild 31786
+MD5 30ab90872cc1960dcb87dfe3a37bb704 xfree-4.3.99.9.ebuild 31586
+MD5 5427f4fd8ed8ee02aba8c8310c446985 ChangeLog 40693
 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 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 07227cb734bf8bc053f2965a3ff77fe6 files/digest-xfree-4.3.0-r2 1928
-MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
-MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
-MD5 ed8d13c2b7f149b9578d52fe96f4d85d files/digest-xfree-4.3.99.11 1394
-MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
 MD5 bf9560cc106d7e0befd63d8729c9b10c files/digest-xfree-4.3.0-r3 2158
-MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
-MD5 e7a9b48bfe345c76aa9a5bf5b3149ea4 files/digest-xfree-4.2.1-r2 10826
 MD5 b54e3468ffe57d029e79273008937c0e files/digest-xfree-4.3.99.10 1630
+MD5 ed8d13c2b7f149b9578d52fe96f4d85d files/digest-xfree-4.3.99.11 1394
 MD5 9f7043b0fff9699184d56a3bb32cf18b files/digest-xfree-4.3.99.9 558
-MD5 bbfd4878d1572717afeeee8ca421d0d3 files/4.2.0/XFree86-4.2.0-i810_i845_20020524.patch.bz2 7093
+MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
+MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
+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 a1e2e9ce27b67b046b9bfe24febe581a files/4.2.0/XFree86-4.2.0-r128-lockup.patch.bz2 344
+MD5 b773eac8dfed3855039201ebebc1fe70 files/4.2.0/XFree86-4.2.0-GeForce2Go.patch.bz2 16409
 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 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 9471f5a22f1b43f75f7c92054192d904 files/4.2.0/XFree86-4.2.0-xft-leak.patch.bz2 423
-MD5 b773eac8dfed3855039201ebebc1fe70 files/4.2.0/XFree86-4.2.0-GeForce2Go.patch.bz2 16409
-MD5 8c8a182fb87437e2c349f2310657c9fe files/4.2.0/XFree86-4.2.0-i810-dri.patch.bz2 373
-MD5 200db00808e991ba97118faa139502be files/4.2.1-r2/startDM.sh 903
+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 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 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 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 8c48b242627d1157afa04fb6af06f2ca files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 20913
-MD5 86fcdca1aaff09ca7358d1a30574f2e8 files/4.2.1-r2/xdm.start 2855
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.2.1-r2/xserver.pamd 284
-MD5 ca411cceb6124020fdb07edef6df90eb files/4.2.1-r2/xft-quality.diff 848
-MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.2.1-r2/xfs.config 1331
-MD5 58b46611c39b0322c25b234abe3ad10a files/4.2.1-r2/xfs.conf.d 803
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.1-r2/XftConfig 7750
-MD5 a4faaaebb9eb237b36c9a55e8bbbf7bc files/4.2.1-r2/chooser.sh 1596
 MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.2.1-r2/10xfree 182
-MD5 4485c7fa46907db803d219218f62a5df files/4.2.1-r2/xinitrc 918
-MD5 5002823053814f70a5fa568beee80aed files/4.2.1-r2/Xsetup_0 866
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.1-r2/XftConfig 7750
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.2.1-r2/Xsession 1521
-MD5 d0cb338160e3be8790524af8071cc4df files/4.2.1-r2/xdm.pamd 380
+MD5 5002823053814f70a5fa568beee80aed files/4.2.1-r2/Xsetup_0 866
+MD5 a4faaaebb9eb237b36c9a55e8bbbf7bc files/4.2.1-r2/chooser.sh 1596
 MD5 bdad7157e991bc78312f7ac6bbc8dbbd files/4.2.1-r2/site.def 3408
+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 cb721d66b1b67c88708ce1613648ee1d files/4.2.1-r2/xfs.start 6602
-MD5 888975c53177c889bf161c7c6ca1134e files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 338
-MD5 bd912edd0e5a73b29305374ed988216a files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 3446
-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 a42f86c7c3c0eb01316bd325e07f25a9 files/4.2.1-patches/094_all_4.2.1-Xft1-Imake-config.patch.bz2 1288
-MD5 31541a840d9412b73f0e759f650efb57 files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 896
-MD5 8d524f120fa5c2e49ccc8f989d50907c files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 4651
-MD5 10279070c11de97f1b61ec707676ec37 files/4.3.0/startDM.sh 901
-MD5 df994262f837448b346405eb7b7a997c files/4.3.0/xdm.start 2853
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
-MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
+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 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
 MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
-MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
-MD5 5002823053814f70a5fa568beee80aed files/4.3.0/Xsetup_0 866
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
-MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
+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 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 027d2f93b478a1c419b8aee64ab2914b files/4.1.0-r6/XftConfig 2002
-MD5 0e3eb0ef30faacadc0372721d57c51f3 files/4.1.0-r6/10xfree 113
-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 a97152f2107f1b91578fd132190728a1 files/4.1.0-r6/xfs.start 796
-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 815f64aac0eec83b9b1bfebd2987d4f2 files/4.2.0-r12/xft-quality.diff 1368
-MD5 96d721e255fad889a2a72ccfff5dc14c files/4.2.0-r12/xfs.config 1432
-MD5 467153debe426cb693f35d66ff493f73 files/4.2.0-r12/xfs.conf.d 521
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.0-r12/XftConfig 7750
-MD5 429888e61c7c6a055bb8d8a249e8f058 files/4.2.0-r12/chooser.sh 1734
-MD5 58fd7e06e4f838fd972399c28a365be1 files/4.2.0-r12/10xfree 144
-MD5 95b2d8e75bfe3ea64d61a42481cbe61f files/4.2.0-r12/xinitrc 918
-MD5 5002823053814f70a5fa568beee80aed files/4.2.0-r12/Xsetup_0 866
-MD5 c790204c66b659a34ed3cce3c65fe740 files/4.2.0-r12/Xsession 1357
-MD5 0b9ba153a9867601b0d2f874a9a899e4 files/4.2.0-r12/site.def 1540
-MD5 9b9b3dea63aa4c2939a085ee5c7e3922 files/4.2.0-r12/xfs.start 1019
+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 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 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 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 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.2.0-r12/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 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/digest-xfree-4.2.1-r2 b/x11-base/xfree/files/digest-xfree-4.2.1-r2
index a256b19cd5d8..9a3289e03239 100644
--- a/x11-base/xfree/files/digest-xfree-4.2.1-r2
+++ b/x11-base/xfree/files/digest-xfree-4.2.1-r2
@@ -1,139 +1,9 @@
-MD5 10e681917f61e8ed068030a373694906 /files/xfree-4.2.x-home_end-keys.patch 666
-MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 /files/xfree-4.2.x.-bison.fixes.patch 2854
-MD5 a9371704cf72bcb8d1aa713ca4b27546 /files/XFree86-4.2.1-Xft11-Imakefile.patch 341
-MD5 bc3aad4b056a41f47d427c036edcef9f /files/XFree86-4.2.1-Xft11-hack.patch 1163
-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 4bfce8fd172c43edba64d0ca2a7c2859 /files/4.2.0/XFree86-4.2.0-agpgart-load.patch.bz2 377
-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 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 d0cb338160e3be8790524af8071cc4df /files/4.2.1/xdm 380
-MD5 95b2d8e75bfe3ea64d61a42481cbe61f /files/4.2.1/xinitrc 918
-MD5 c790204c66b659a34ed3cce3c65fe740 /files/4.2.1/Xsession 1357
-MD5 5002823053814f70a5fa568beee80aed /files/4.2.1/Xsetup_0 866
-MD5 ca411cceb6124020fdb07edef6df90eb /files/4.2.1/xft-quality.diff 848
-MD5 9a8ad2dde4c0065abfd96e89ede5a4c4 /files/4.2.1/site.def 1657
-MD5 b0a2e8701fb1d9612ce0b5a6ed09a217 /files/4.2.1/xfs.conf.d 800
-MD5 cd134533626eb3ab261e50ddbcbc46a5 /files/4.2.1/xfs.config 1395
-MD5 4c7c5e81d6448587367733b91a946683 /files/4.2.1/chooser.sh 1730
-MD5 f606a3b40ad281dad53fbd8681b8a153 /files/4.2.1/startDM.sh 819
-MD5 eea2d73b6b79fb5d7cf159405dd4e7e7 /files/4.2.1/xdm.start 2839
-MD5 8c7059271b4e3fc2459e93fa4e38e90c /files/4.2.1/xfs.start 4770
-MD5 2d22ba49943c630e4299f439d3a0d4cc /files/4.2.1/XftConfig 7750
-MD5 58fd7e06e4f838fd972399c28a365be1 /files/4.2.1/10xfree 144
-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 d0f407b9eb5d6c84cd081117ea695886 /files/4.3.0/site.def 3688
-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 58132298c12f8301edc73bde9f1882e5 /files/4.3.0/chooser.sh 1594
-MD5 10279070c11de97f1b61ec707676ec37 /files/4.3.0/startDM.sh 901
-MD5 df994262f837448b346405eb7b7a997c /files/4.3.0/xdm.start 2853
-MD5 6e3702a42df83bc3c45f047e44a42c48 /files/4.3.0/xfs.start 6600
-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 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 761a27c21b936f1a89323eb6ec13cbfb /files/4.2.0-r12/startDM.sh 605
-MD5 16270023fb31cfad7ff0c6a62c1e295e /files/4.2.0-r12/xdm.start 2843
-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 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 888975c53177c889bf161c7c6ca1134e /files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 338
-MD5 a42f86c7c3c0eb01316bd325e07f25a9 /files/4.2.1-patches/094_all_4.2.1-Xft1-Imake-config.patch.bz2 1288
-MD5 95b2d8e75bfe3ea64d61a42481cbe61f /files/4.2.1-r1/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 /files/4.2.1-r1/xserver.pamd 284
-MD5 d013132571fa32d48f88e694cdfd7fe6 /files/4.2.1-r1/108_all_4.2.1-xterm-enable-backspace.patch 361
-MD5 db374f2a3d1b4fee530a7ac66b05e3b6 /files/4.2.1-r1/Xsession 1553
-MD5 5002823053814f70a5fa568beee80aed /files/4.2.1-r1/Xsetup_0 866
-MD5 ca411cceb6124020fdb07edef6df90eb /files/4.2.1-r1/xft-quality.diff 848
-MD5 73df6df939302a84d8a45f072af1c21c /files/4.2.1-r1/site.def 3259
-MD5 d0cb338160e3be8790524af8071cc4df /files/4.2.1-r1/xdm.pamd 380
-MD5 86c78a03e92a062cfbf28687d838cdf4 /files/4.2.1-r1/xfs.conf.d 803
-MD5 cd134533626eb3ab261e50ddbcbc46a5 /files/4.2.1-r1/xfs.config 1395
-MD5 aa7c9ae15a5c2ed17a79aa2c500185df /files/4.2.1-r1/chooser.sh 1596
-MD5 fe0920f21cf1a773bd401d90880d8293 /files/4.2.1-r1/startDM.sh 822
-MD5 2823958276a42d099444399015410604 /files/4.2.1-r1/110_all_4.2.1-xf86_h-missing-bracket-fix.patch 374
-MD5 f0ab587bf8b41dbce9a88643526c49c6 /files/4.2.1-r1/109_ppc_4.2.1-xterm-eightBitInput-fix.patch 325
-MD5 d3aec8bb885f047d3a62e8c4d91aaa33 /files/4.2.1-r1/xdm.start 2842
-MD5 99cb8dfc49a9bd97045a52bf356d2057 /files/4.2.1-r1/xfs.start 5152
-MD5 2d22ba49943c630e4299f439d3a0d4cc /files/4.2.1-r1/XftConfig 7750
-MD5 58fd7e06e4f838fd972399c28a365be1 /files/4.2.1-r1/10xfree 144
-MD5 4485c7fa46907db803d219218f62a5df /files/4.2.1-r2/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 /files/4.2.1-r2/xserver.pamd 284
-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 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 d0cb338160e3be8790524af8071cc4df /files/4.2.1-r2/xdm.pamd 380
-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 8fe715586bbd0669ac4500f962880815 /files/4.3.0-patches/XFree86-4.3.0-sparc-kb.patch 1199
-MD5 4e73fd85163c7ea9774f01f4dd36b2da /files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch 427
-MD5 b2c509837ddfbd12d8f1ed9b50254f01 /files/4.2.1/lib/libOSMesa.la 788
-MD5 18e1ac4e97a57fdba470897aa2cb452e /files/4.2.1/lib/libGLU.la 769
-MD5 ee55a387073cca1b14f1b285e1cf33a9 /files/4.2.1/lib/libGL.la 777
-MD5 a0ce0f1c8a5771a1194f5895211a3f66 /files/4.2.1/Sessions/Xsession 2187
-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 a0ce0f1c8a5771a1194f5895211a3f66 /files/4.2.0-r12/Sessions/Xsession 2187
-MD5 b2c509837ddfbd12d8f1ed9b50254f01 /files/4.2.1-r1/lib/libOSMesa.la 788
-MD5 18e1ac4e97a57fdba470897aa2cb452e /files/4.2.1-r1/lib/libGLU.la 769
-MD5 ee55a387073cca1b14f1b285e1cf33a9 /files/4.2.1-r1/lib/libGL.la 777
-MD5 a0ce0f1c8a5771a1194f5895211a3f66 /files/4.2.1-r1/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 a0ce0f1c8a5771a1194f5895211a3f66 /files/4.2.1-r2/Sessions/Xsession 2187
-MD5 383d666b7cd924b8fd8001906ec132dc /xfree-4.2.1-r2.ebuild 24326
 MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532
 MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328
 MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679
 MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
 MD5 38adc94a4953a6b29e8619c25dda4887 4.2.0-4.2.1.diff.gz 54763
-MD5 50891a2431cc829d98829e385e2c452c XFree86-4.2.1-patches-1.2.tar.bz2 405424
+MD5 2f370568407c37b43a21ac027967d8a6 XFree86-4.2.1-patches-1.3.tar.bz2 403237
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
 MD5 43e5e0209a9400b946f38d7c731c968c sis_drv_src_210303-1.tar.gz 378880
diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild
index 14cc4c5ffb55..ef9268f7c381 100644
--- a/x11-base/xfree/xfree-4.2.1-r2.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r2.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.2.1-r2.ebuild,v 1.30 2003/08/03 04:44:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.31 2003/09/07 02:25:28 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 ...
@@ -38,7 +38,7 @@ replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
 # <azarah@gentoo.org> (13 Oct 2002)
 strip-flags
 
-PATCH_VER="1.2"
+PATCH_VER="1.3"
 FT2_VER="2.1.2"
 FC2_VER="2.1"
 SISDRV_VER="210303-1"
@@ -229,7 +229,7 @@ src_unpack() {
 		done
 		ebegin "Done unpacking Core Fonts"; eend 0
 	fi
-	
+
 	ebegin "Setting up config/cf/host.def"
 	cd ${S}; cp ${FILESDIR}/${PVR}/site.def config/cf/host.def || die
 	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \