diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2003-08-28 07:42:15 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2003-08-28 07:42:15 +0000 |
| commit | b39a09afd09de7c0676e43dd766c540816d76231 (patch) | |
| tree | 3d2e2e28e33fcf673d6c1444584e20fef89d71ce /x11-base | |
| parent | undo stable move (diff) | |
| download | historical-b39a09afd09de7c0676e43dd766c540816d76231.tar.gz historical-b39a09afd09de7c0676e43dd766c540816d76231.tar.bz2 historical-b39a09afd09de7c0676e43dd766c540816d76231.zip | |
Removing 4.3.99.8
Diffstat (limited to 'x11-base')
24 files changed, 84 insertions, 2451 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index f0a33336067c..ec51234c0f9b 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,18 @@ # 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.172 2003/08/25 21:17:10 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.173 2003/08/28 07:42:12 spyderous Exp $ + + 28 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.8.ebuild, + files/4.3.99.8/10xfree, files/4.3.99.8/AuthLib.patch, + files/4.3.99.8/XftConfig, files/4.3.99.8/Xsession, files/4.3.99.8/Xsetup_0, + files/4.3.99.8/acecad.patch, files/4.3.99.8/chooser.sh, + files/4.3.99.8/exports-lib.patch, files/4.3.99.8/site.def, + files/4.3.99.8/startDM.sh, files/4.3.99.8/xdm.pamd, + files/4.3.99.8/xdm.start, files/4.3.99.8/xfs.conf.d, + files/4.3.99.8/xfs.config, files/4.3.99.8/xfs.start, files/4.3.99.8/xinitrc, + files/4.3.99.8/xserver.pamd, files/4.3.99.8/lib/libGL.la, + files/4.3.99.8/lib/libGLU.la, files/4.3.99.8/lib/libOSMesa.la: + Removing 4.3.99.8. 25 Aug 2003; Olivier Crete <tester@gentoo.org> xfree-4.3.0-r3.ebuild: Fix ebuild to use system zlib on amd64 and mark stable on it diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest index 9782b79edbc9..8f458662f234 100644 --- a/x11-base/xfree/Manifest +++ b/x11-base/xfree/Manifest @@ -1,128 +1,105 @@ -MD5 30ab90872cc1960dcb87dfe3a37bb704 xfree-4.3.99.9.ebuild 31586 +MD5 96d2085fae9ca7b948978ba30d1450b5 ChangeLog 39594 +MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963 -MD5 66296954503547211cc3f26f2ececf5f xfree-4.3.0-r2.ebuild 31357 -MD5 def56c51cb1af0c18123da88760adfe2 xfree-4.3.99.8.ebuild 31875 -MD5 b35f68907eb1c04375a133178e01d2a6 xfree-4.3.0-r1.ebuild 25121 +MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302 MD5 b5edffe4c64877f950e5b9cc9e6b6dd2 xfree-4.2.1-r2.ebuild 24184 +MD5 b35f68907eb1c04375a133178e01d2a6 xfree-4.3.0-r1.ebuild 25121 +MD5 66296954503547211cc3f26f2ececf5f xfree-4.3.0-r2.ebuild 31357 MD5 fa9dfb0716c04d8fed80b77c4efc8547 xfree-4.3.0-r3.ebuild 33887 +MD5 30ab90872cc1960dcb87dfe3a37bb704 xfree-4.3.99.9.ebuild 31586 MD5 24cdcd01eb1136c73d605f2353336983 xfree-4.3.99.10.ebuild 31058 -MD5 f7e5d69ed7487ffc7cf23c9b6b26950b ChangeLog 38925 -MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228 -MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302 +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 e7a9b48bfe345c76aa9a5bf5b3149ea4 files/digest-xfree-4.2.1-r2 10826 MD5 be43a94caab2339e3a00372906f115a0 files/digest-xfree-4.3.0-r1 1384 MD5 07227cb734bf8bc053f2965a3ff77fe6 files/digest-xfree-4.3.0-r2 1928 MD5 be1353b3e8407aee9213153a79643cc7 files/digest-xfree-4.3.0-r3 2158 -MD5 1c7cafb1b2985413aefab2e4104ef564 files/digest-xfree-4.3.99.8 475 -MD5 9f7043b0fff9699184d56a3bb32cf18b files/digest-xfree-4.3.99.9 558 -MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576 +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 9f7043b0fff9699184d56a3bb32cf18b files/digest-xfree-4.3.99.9 558 MD5 b54e3468ffe57d029e79273008937c0e files/digest-xfree-4.3.99.10 1630 -MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163 +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 4485c7fa46907db803d219218f62a5df files/4.3.99.8/xinitrc 918 -MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.99.8/xserver.pamd 284 -MD5 1dce71af5c332082a48659f24364c55b files/4.3.99.8/acecad.patch 381 -MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.99.8/Xsession 1521 -MD5 5002823053814f70a5fa568beee80aed files/4.3.99.8/Xsetup_0 866 -MD5 adce279a2319dbd137411e8c1ccde654 files/4.3.99.8/site.def 3696 -MD5 d0cb338160e3be8790524af8071cc4df files/4.3.99.8/xdm.pamd 380 -MD5 34b8bbb2bb19ce606c4a627ab8b0b330 files/4.3.99.8/xfs.conf.d 806 -MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.99.8/xfs.config 1331 -MD5 c4710fd4cb5ecffdb21383bbf73b8a09 files/4.3.99.8/chooser.sh 1599 -MD5 31d6198e20758de0577fa6573a8c0eaa files/4.3.99.8/startDM.sh 906 -MD5 99159b76f891ce30c849e26d71a7601b files/4.3.99.8/xdm.start 2858 -MD5 7b65b1b24b3305a2f0aa09d52dc61dad files/4.3.99.8/xfs.start 6667 -MD5 eb50450276d7929439f8a5cfddb4618a files/4.3.99.8/exports-lib.patch 317 -MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.99.8/XftConfig 7750 -MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.99.8/10xfree 182 -MD5 34f21b823a53c7f8c10be3c4495e135c files/4.3.99.8/AuthLib.patch 482 -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 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.99.8/lib/libOSMesa.la 788 -MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.99.8/lib/libGLU.la 769 -MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.99.8/lib/libGL.la 777 -MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.99.8/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/4.3.99.8/10xfree b/x11-base/xfree/files/4.3.99.8/10xfree deleted file mode 100644 index 4dba95e6bd68..000000000000 --- a/x11-base/xfree/files/4.3.99.8/10xfree +++ /dev/null @@ -1,7 +0,0 @@ -PATH=/usr/X11R6/bin -ROOTPATH=/usr/X11R6/bin -LDPATH=/usr/X11R6/lib -MANPATH=/usr/X11R6/man -INFODIR=/usr/X11R6/info -XINITRC=/etc/X11/xinit/xinitrc -CONFIG_PROTECT=/usr/X11R6/lib/X11/xkb diff --git a/x11-base/xfree/files/4.3.99.8/AuthLib.patch b/x11-base/xfree/files/4.3.99.8/AuthLib.patch deleted file mode 100644 index 885de38984a9..000000000000 --- a/x11-base/xfree/files/4.3.99.8/AuthLib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Imakefile.old 2003-06-15 00:37:26.000000000 +1000 -+++ Imakefile 2003-06-15 00:38:11.000000000 +1000 -@@ -187,7 +187,7 @@ - #if BuildLBX || GzipFontCompression - ZLIB = GzipLibrary - #endif -- OS = os/LibraryTargetName(os) $(DEPXAUTHLIB) $(DEPXDMCPLIB) -+ OS = os/LibraryTargetName(os) $(DEPXAUTHLIB) $(DEPXDMCPLIB) ../../exports/lib/libXau.a - BSDEMUL = $(DEPXBSDLIB) - #if DoLoadableServer - MFB = mfb/ModuleLibraryTargetName(mfb) diff --git a/x11-base/xfree/files/4.3.99.8/XftConfig b/x11-base/xfree/files/4.3.99.8/XftConfig deleted file mode 100644 index 352757a1ce64..000000000000 --- a/x11-base/xfree/files/4.3.99.8/XftConfig +++ /dev/null @@ -1,239 +0,0 @@ -# -# XftConfig -# -# Use with Type1 and TrueType fonts -# - -# Note that each application scans all these directories -# during startup, so you may want to disable some to -# get better speed. - -# Standard XFree86 Type 1 fonts -dir "/usr/X11R6/lib/X11/fonts/Type1" -# TTF fonts -dir "/usr/X11R6/lib/X11/fonts/truetype" -dir "/usr/X11R6/lib/X11/fonts/TrueType" -dir "/usr/X11R6/lib/X11/fonts/TTF" -# User installed fonts -dir "/opt/ttfonts" -# URW fonts -dir "/usr/share/fonts/default/Type1" -# Localized Truetype fonts -dir "/usr/share/fonts/truetype" -dir "/usr/share/fonts/ttf/western" -dir "/usr/share/fonts/ttf/big5" -dir "/usr/share/fonts/ttf/gb2312" -dir "/usr/share/fonts/ttf/japanese" -dir "/usr/share/fonts/ttf/korean" -dir "/usr/share/fonts/ttf/armenian" -dir "/usr/share/fonts/ttf/decoratives" -dir "/usr/share/fonts/ttf/thai" -# don't yet exist, but i hope to include some day a package for them (Pablo) -dir "/usr/share/fonts/ttf/cyrillic" -dir "/usr/share/fonts/ttf/viet" -dir "/usr/share/fonts/ttf/ethiopic" -dir "/usr/share/fonts/ttf/georgian" -dir "/usr/share/fonts/ttf/arabic" -dir "/usr/share/fonts/ttf/hebrew" -dir "/usr/share/fonts/ttf/unicode" -# AbiSuite comes with URW fonts as well -dir "/usr/share/AbiSuite/fonts" - -# -# alias 'fixed' for 'mono' -# -match any family == "fixed" edit family =+ "mono"; - -# -# Check users config file -# -includeif "~/.xftconfig" - -# -# Substitute TrueType fonts for Type1 versions -# -match any family == "Times" edit family =+ "Times New Roman"; -match any family == "Helvetica" edit family =+ "Verdana"; -match any family == "Courier" edit family =+ "Courier New"; - -# -# Use TrueType fonts for defaults -# -match any family == "serif" edit family += "Times New Roman"; -match any family == "sans" edit family += "Arial"; -match any family == "sans" edit family += "Verdana"; - -# -# Use monotype.com (andale) face where possible -# -match - any family == "mono" - all slant == roman - all weight < bold -edit - family += "monotype.com"; -# -# otherwise, use courier -# -match any family == "mono" edit family += "Courier New"; -match any family == "mono" edit family += "Courier"; - -# -# Alias between XLFD families and font file family name, prefer local fonts -# -match any family == "Charter" edit family += "Bitstream Charter"; -match any family == "Bitstream Charter" edit family =+ "Charter"; - -match any family == "Lucidux Serif" edit family += "LuciduxSerif"; -match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; - -match any family == "Lucidux Sans" edit family += "LuciduxSans"; -match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; - -match any family == "Lucidux Mono" edit family += "LuciduxMono"; -match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; - -# -# TrueType font aliases -# -match any family == "Comic Sans" edit family += "Comic Sans MS"; -match any family == "Comic Sans MS" edit family =+ "Comic Sans"; -match any family == "Trebuchet" edit family += "Trebuchet MS"; -match any family == "Trebuchet MS" edit family =+ "Trebuchet"; -match any family == "Monotype" edit family =+ "Monotype.com"; -match any family == "Andale Mono" edit family += "Monotype.com"; -match any family == "Monotype.com" edit family =+ "Andale Mono"; - -# modifications from Laurent Culioli -match - any family == "webdings" - edit antialias = false; - encoding += "glyphs-fontspecific"; -match - any family == "wingdings" - edit antialias = false; - encoding += "glyphs-fontspecific"; - -# extra aliases -- pablo - -# a nice default for sans serif (same as used in yudit) -match any family == "sans" edit family =+ "Arial"; -match any family == "sans" edit family =+ "MS Gothic"; -match any family == "sans" edit family =+ "Gulim"; -match any family == "sans" edit family =+ "Baekmuk unigulir"; -match any family == "sans" edit family =+ "Lucida Sans Unicode"; -match any family == "sans" edit family =+ "Tahoma"; -match any family == "sans" edit family =+ "BPG UTF8 M"; -match any family == "sans" edit family =+ "GF Zemen Unicode"; -match any family == "sans" edit family =+ "MS Mincho"; -match any family == "sans" edit family =+ "Pigiarniq"; -match any family == "sans" edit family =+ "Urdu Naqsh Nastalique"; -match any family == "sans" edit family =+ "Ballymun RO"; -# a nice monospaced one -match any family == "mono" edit family =+ "Lucida Console"; -# korean -match any family == "Gulim" edit family =+ "Baekmuk unigulir"; -match any family == "Batang" edit family =+ "Ubatang"; -match any family == "sans" edit family =+ "Gulim"; -match any family == "serif" edit family =+ "Batang"; -match any family == "mono" edit family =+ "Gulim"; -# chinese gb2312 -match any family == "Kaiti" edit family =+ "AR PL KaitiM GB"; -match any family == "Sungti" edit family =+ "AR PL SungtiL GB"; -match any family == "sans" edit family =+ "Sungti"; -match any family == "serif" edit family =+ "Sungti"; -# chinese big5 -match any family == "Kaiti" edit family =+ "AR PL KaitiM Big5"; -match any family == "Mingti" edit family =+ "AR PL Mingti2L Big5"; -match any family == "sans" edit family =+ "Mingti"; -match any family == "serif" edit family =+ "Mingti"; -# thai -match any family == "sans" edit family =+ "Norasi"; -match any family == "serif" edit family =+ "Norasi"; -# armenian -match any family == "Helvetica" edit family =+ "ArmNet Helvetica"; -match any family == "sans" edit family =+ "ArmNet Helvetica"; -match any family == "serif" edit family =+ "ArmNet Helvetica"; -# indic -match any family == "Raghindi" edit family =+ "Raghu"; -match any family == "sans" edit family =+ "Raghindi"; -match any family == "serif" edit family =+ "Raghindi"; - -# -# If the Microsoft Web Fonts are not installed, we have to find a -# replacement -# - -# these come with Sun JDK 1.3 -match any family == "Verdana" edit family =+ "Lucida Sans"; -match any family == "Times New Roman" edit family =+ "Lucida Bright"; -match any family == "Courier New" edit family =+ "Lucida Sans Typewriter"; - -# OpenOffice 6 -match any family == "Verdana" edit family =+ "Lucida Sans Tur"; -match any family == "Times New Roman" edit family =+ "Lucida Bright Tur"; -match any family == "Courier New" edit family =+ "Lucida Sans Typewriter Tur"; - -# ttfonts from RH7 -match any family == "Verdana" edit family =+ "Helmet"; - -# URW fonts -match any family == "Verdana" edit family =+ "Nimbus Sans L"; -match any family == "Times New Roman" edit family =+ "Nimbus Roman No9 L"; -match any family == "Courier New" edit family =+ "Nimbus Mono L"; - -# western fonts -match any family == "Verdana" edit family =+ "Blue Highway"; - -# XFree86 default fonts -match any family == "Verdana" edit family =+ "LuciduxSans"; -match any family == "Times New Roman" edit family =+ "LuciduxSerif"; - - -# last ressort defaults -match any family == "Courier" edit family =+ "mono"; - -match any family == "Helvetica" edit family =+ "sans"; -match any family == "Arial" edit family =+ "sans"; - -match any family == "serif" edit family =+ "sans"; -match any family == "Times" edit family =+ "serif"; - -# Aditions from Danny Tholen - -match - any family == "symbol" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "Standard Symbols L" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "dingbats" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - - -match - any family == "Cursor" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "StarBats" -edit - antialias = false; - encoding += "glyphs-fontspecific"; - -match - any family == "StarMath" -edit - antialias = false; - encoding += "glyphs-fontspecific"; diff --git a/x11-base/xfree/files/4.3.99.8/Xsession b/x11-base/xfree/files/4.3.99.8/Xsession deleted file mode 100644 index ffeef4c87420..000000000000 --- a/x11-base/xfree/files/4.3.99.8/Xsession +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash --login -# -# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $ - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# handle KDM -if [ -n "$1" ]; then - export XSESSION="$1" -fi - -xinitdir=/usr/X11R6/lib/X11/xinit -startup=$HOME/.xsession -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=$xinitdir/.Xresources -sysmodmap=$xinitdir/.Xmodmap - -# First run the system default. Because KDE uses this -# to switch sessions, we MUST first check the system -# default, and then ~/.xsession. If the user Do not -# want this, he should override XSESSION, or at least -# clear it. -if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -# If not defined, try the user's ~/.xsession -elif [ -s "$startup" ]; then - - # merge in defaults and keymaps - - if [ -f $sysresources ]; then - xrdb -merge $sysresources - fi - - if [ -f $sysmodmap ]; then - xmodmap $sysmodmap - fi - - if [ -f $userresources ]; then - xrdb -merge $userresources - fi - - if [ -f $usermodmap ]; then - xmodmap $usermodmap - fi - - if [ -x "$startup" ]; then - exec "$startup" - else - exec /bin/sh "$startup" - fi -# Lastly, xsm as failsafe -else - if [ -r "$userresources" ]; then - xrdb -load "$userresources" - fi - exec xsm -fi - diff --git a/x11-base/xfree/files/4.3.99.8/Xsetup_0 b/x11-base/xfree/files/4.3.99.8/Xsetup_0 deleted file mode 100644 index 2022592bb146..000000000000 --- a/x11-base/xfree/files/4.3.99.8/Xsetup_0 +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail - -# get KDEDIR value (only) and run kdmdesktop from there -eval "`grep KDEDIR /etc/profile.env`" -[ -n "$KDEDIR" ] && ${KDEDIR}/bin/kdmdesktop - -# --- Gentoo --- -# create list of sessions for kdm -sessions="SessionTypes=" -for x in `ls /etc/X11/Sessions` -do - sessions="${sessions}${x}," -done -echo sessions: $sessions - -# update all kdmrcs located; tries some pretty much impossible locations -# to make sure we get 'em all -source /etc/make.conf -for dir in /usr/kde/* /usr $KDEDIR $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR -do - - echo "Changing kdmrc in $dir" - cd ${dir}/share/config/kdm || continue - - cp kdmrc kdmrc.orig - sed -e "/SessionTypes=/c\ -${sessions}" kdmrc.orig > kdmrc - rm kdmrc.orig - -done diff --git a/x11-base/xfree/files/4.3.99.8/acecad.patch b/x11-base/xfree/files/4.3.99.8/acecad.patch deleted file mode 100644 index 978a3aa3b304..000000000000 --- a/x11-base/xfree/files/4.3.99.8/acecad.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/input/acecad/Imakefile.old 2003-06-16 23:23:40.000000000 +1000 -+++ programs/Xserver/hw/xfree86/input/acecad/Imakefile 2003-06-16 23:24:23.000000000 +1000 -@@ -6,6 +6,10 @@ - SRCS = acecad.c - OBJS = acecad.o - -+#if HasLinuxInput -+DEFINES = -DLINUX_INPUT -+#endif -+ - DRIVER = acecad - - INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ diff --git a/x11-base/xfree/files/4.3.99.8/chooser.sh b/x11-base/xfree/files/4.3.99.8/chooser.sh deleted file mode 100644 index 686c0cd496a7..000000000000 --- a/x11-base/xfree/files/4.3.99.8/chooser.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.99.8/chooser.sh,v 1.1 2003/07/11 22:54:09 spyderous Exp $ - -# If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf -if [ -z "${XSESSION}" ] -then - [ -f /etc/conf.d/basic ] && source /etc/conf.d/basic - [ -f /etc/rc.conf ] && source /etc/rc.conf -fi - -# Find a match for $XSESSION in /etc/X11/Sessions -GENTOO_SESSION="" -for x in /etc/X11/Sessions/* -do - if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \ - = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ] - then - GENTOO_SESSION=${x} - break - fi -done - -GENTOO_EXEC="" - -if [ -n "${XSESSION}" ]; then - if [ -f /etc/X11/Sessions/${XSESSION} ]; then - if [ -x /etc/X11/Sessions/${XSESSION} ]; then - GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}" - else - GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}" - fi - elif [ -n "${GENTOO_SESSION}" ]; then - if [ -x "${GENTOO_SESSION}" ]; then - GENTOO_EXEC="${GENTOO_SESSION}" - else - GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}" - fi - else - x="" - y="" - - for x in "${XSESSION}" \ - "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \ - "`echo ${XSESSION} | awk '{ print tolower($1) }'`" - do - # Fall through ... - if [ -x "`which ${x} 2>/dev/null`" ]; then - GENTOO_EXEC="`which ${x} 2>/dev/null`" - break - fi - done - - # If all else fail, run twm - GENTOO_EXEC="/usr/X11R6/bin/twm" - fi -fi - -echo "${GENTOO_EXEC}" - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.99.8/exports-lib.patch b/x11-base/xfree/files/4.3.99.8/exports-lib.patch deleted file mode 100644 index 3b8c6cfd511a..000000000000 --- a/x11-base/xfree/files/4.3.99.8/exports-lib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.old 2003-06-13 12:17:39.000000000 +1000 -+++ Makefile 2003-06-13 12:18:11.000000000 +1000 -@@ -86,6 +86,7 @@ - $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean - $(MAKE_CMD) $(MFLAGS) includes - $(MAKE_CMD) $(MFLAGS) depend -+ mkdir -p exports/lib - $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World - @echo "" - @date diff --git a/x11-base/xfree/files/4.3.99.8/lib/libGL.la b/x11-base/xfree/files/4.3.99.8/lib/libGL.la deleted file mode 100644 index 8566b67d4c3d..000000000000 --- a/x11-base/xfree/files/4.3.99.8/lib/libGL.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.1.2 libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGL. -current=3 -age=2 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib/opengl/xfree/lib' diff --git a/x11-base/xfree/files/4.3.99.8/lib/libGLU.la b/x11-base/xfree/files/4.3.99.8/lib/libGLU.la deleted file mode 100644 index 86b6432cf5db..000000000000 --- a/x11-base/xfree/files/4.3.99.8/lib/libGLU.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGLU.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGLU.so.1' - -# Names of this library. -library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGLU. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib' diff --git a/x11-base/xfree/files/4.3.99.8/lib/libOSMesa.la b/x11-base/xfree/files/4.3.99.8/lib/libOSMesa.la deleted file mode 100644 index 56a72ed91f02..000000000000 --- a/x11-base/xfree/files/4.3.99.8/lib/libOSMesa.la +++ /dev/null @@ -1,32 +0,0 @@ -# libOSMesa.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libOSMesa.so.3' - -# Names of this library. -library_names='libOSMesa.so.3.3 libOSMesa.so.3 libOSMesa.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libOSMesa. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/X11R6/lib' diff --git a/x11-base/xfree/files/4.3.99.8/site.def b/x11-base/xfree/files/4.3.99.8/site.def deleted file mode 100644 index 2c11a252d321..000000000000 --- a/x11-base/xfree/files/4.3.99.8/site.def +++ /dev/null @@ -1,116 +0,0 @@ -/* Use buildin zlib to try and fix segfaults. Bug #4777 */ -#define HasZlib NO -#define HasNCurses YES -#define HasLibCrypt YES -#define HasTk NO -#define HasTcl NO -#define FSUseSyslog YES -#define HasExpat YES - -#define LocalThreads YES -#define ThreadedX YES -#define HasPosixThreads YES -#define HasThreadSafeAPI YES - -#define HasGcc2ForCplusplus YES - -#define BuildXinerama YES -#define BuildXineramaLibrary YES - -/* Do not change, as it can break things like gdm */ -#define SharedLibXau YES -/* Needed for 104_all_4.2.1-fix-shared-libXau-link.v2.patch.bz2 */ - -#define HasFreetype2 YES -#define UseFreetype2 YES -#define Freetype2LibDir /usr/lib -/* #define BuildFreetype2Library YES */ -#define UseFontconfig YES -/* This is currently broken, so we depend on fontconfig, and then - just do not install any fontconfig related files ... */ -/* #define HasFontconfig YES */ - -/* We PDEPEND on Xft2, and link XFree86 only to the static lib, - so that we will not have conflicting files for Xft2 from - x11-base/xfree and x11-libs/xft ... */ -/* #define SharedLibXft NO */ -#define SharedLibXft1 YES - -#define BuildFonts YES -/* #define BuildCyrillicFonts YES */ -#define DefaultCursorTheme whiteglass -#define BuildXF86MiscExt YES -#define BuildXInputExt YES -#define BuildXKB YES -#define BuildDBE YES -#define BuildScreenSaverExt YES -#define BuildRman YES -#define BuildHtmlManPages NO -#define BuildAllSpecsDocs NO -#define BuildSpecsDocs NO - -#define BuildXF86DRI YES -/* #define BuildXF86DRM YES */ -#define HasAgpGart YES -#define BuildGLXLibrary YES -#define BuildGlxExt YES -/* #define GlxUseSGISI YES */ -#define BuildGLULibrary YES -#define SharedLibGLU YES -#define NormalLibGLU YES -#define BuildXvExt YES -#define BuildXF86DGA YES -#define BuildRender YES - -/* Need this to build libs with -fPIC */ -#undef StaticNeedsPicForShared -#undef BuildLibGlxWithoutPIC -#define StaticNeedsPicForShared YES -#define BuildLibGlxWithoutPIC NO - -/* Broken in 4.x */ -#define JoystickSupport NO - -#define DoLoadableServer YES - -#define BuildRECORD YES - -#define UseMatroxHal NO - -#define UseConfDirForXkb NO -/* #define UseConfDirForAppDefaults NO */ - -#undef DefaultUserPath -#define DefaultUserPath /usr/local/bin:/bin:/usr/bin -#undef DefaultSystemPath -#define DefaultSystemPath /usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin - -#define AdmDir /var/log -#define LbxproxyDir /etc/X11/lbxproxy -#define ProxyManagerDir /etc/X11/proxymngr -#define ServerConfigDir /etc/X11/xserver -#define XdmDir /etc/X11/xdm -#define XConfigDir /etc/X11 -#define XinitDir /etc/X11/xinit - -/* BOTH XIE and PEX were deprecated in XFree86 4.1.0 and are now obsolete */ -#define BuildPhigs NO -#define BuildPexExt NO -#define BuildPexLib NO -#define BuildXIE NO -#define BuildXIElib NO - -/* required for Lokis Erics Ultimate Solitaire */ -#define UseInternalMalloc NO -#define ForceNormalLib YES -#define SharedLibXxf86vm YES -#define SharedLibXxf86dga YES -#define SharedLibXxf86misc YES -#define SharedLibXv YES - -/* binutils-2.9 */ -#define LinuxBinUtilsMajorVersion 29 -/* glibc-2.2 (6.2 because glibc is considered libc-6) */ -#define LinuxCLibMajorVersion 6 -#define LinuxClibMinorVersion 2 - diff --git a/x11-base/xfree/files/4.3.99.8/startDM.sh b/x11-base/xfree/files/4.3.99.8/startDM.sh deleted file mode 100644 index ef9ce1c644fe..000000000000 --- a/x11-base/xfree/files/4.3.99.8/startDM.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.99.8/startDM.sh,v 1.1 2003/07/11 22:54:09 spyderous Exp $ - -source /etc/init.d/functions.sh - -# We need to source /etc/profile for stuff like $LANG to work -# bug #10190. -source /etc/profile - -# Great new Gnome2 feature, AA -# We enable this by default -export GDK_USE_XFT=1 - -if [ -e ${svcdir}/options/xdm/service ] -then - retval=0 - EXE="`cat ${svcdir}/options/xdm/service`" - - /sbin/start-stop-daemon --start --quiet --exec ${EXE} - retval=$? - sleep 5 - - if [ "${retval}" -ne 0 ] - then - # there was a error running the DM - einfo "ERROR: could not start the Display Manager..." - # make sure we do not have a misbehaving DM - killall -9 ${EXE##*/} - fi -fi - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.99.8/xdm.pamd b/x11-base/xfree/files/4.3.99.8/xdm.pamd deleted file mode 100644 index 1d2e081625f1..000000000000 --- a/x11-base/xfree/files/4.3.99.8/xdm.pamd +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_stack.so service=system-auth -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_stack.so service=system-auth -password required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth -session optional /lib/security/pam_console.so diff --git a/x11-base/xfree/files/4.3.99.8/xdm.start b/x11-base/xfree/files/4.3.99.8/xdm.start deleted file mode 100644 index 5bce1e0221bf..000000000000 --- a/x11-base/xfree/files/4.3.99.8/xdm.start +++ /dev/null @@ -1,112 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.99.8/xdm.start,v 1.1 2003/07/11 22:54:09 spyderous Exp $ - -# This is here to serve as a note to myself, and future developers. -# -# Any Display manager (gdm,kdm,xdm) have the following problem: if -# it is started before any getty, and no vt is specified, it will -# usually run on vt2. When the getty on vt2 then starts, and the -# DM is already started, the getty will take control of the keyboard, -# leaving us with a "dead" keyboard. -# -# Resolution: add the following line to /etc/inittab -# -# x:a:once:/etc/X11/startDM.sh -# -# and have /etc/X11/startDM.sh start the DM in daemon mode if -# a lock is present (with the info of what DM should be started), -# else just fall through. -# -# How this basically works, is the "a" runlevel is a additional -# runlevel that you can use to fork processes with init, but the -# runlevel never gets changed to this runlevel. Along with the "a" -# runlevel, the "once" key word means that startDM.sh will only be -# run when we specify it to run, thus eliminating respawning -# startDM.sh when "xdm" is not added to the default runleve, as was -# done previously. -# -# This script then just calls "tellinit a", and init will run -# /etc/X11/startDM.sh after the current runlevel completes (this -# script should only be added to the actual runlevel the user is -# using). -# -# Martin Schlemmer -# aka Azarah -# 04 March 2002 - - -# Start X Font Server before X -depend() { - use xfs hotplug -} - -setup_dm() { - source /etc/profile.env - export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}" - - case "$(echo ${DISPLAYMANAGER} | awk '{ print toupper($1) }')" in - KDM|KDE|KDE2|KDE3) - EXE="$(which kdm)" - ;; - ELOGIN*) - EXE="$(which elogind)" - ;; - ENTRANCE*) - EXE="$(which entranced)" - ;; - GDM|GNOME) - EXE=/usr/bin/gdm - ;; - *) - EXE=/usr/X11R6/bin/xdm - ;; - esac - - test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm - - SERVICE="${EXE##*/}" -} - -start() { - setup_dm - - ebegin "Setting up ${SERVICE}" - #save the prefered DM - save_options "service" "${EXE}" - #tell init to run /etc/X11/startDM.sh after current - #runlevel is finished (should *not* be in the "boot" - # runlevel). - /sbin/telinit a &>/dev/null - eend 0 -} - -stop() { - local retval=0 - local curvt="$(fgconsole)" - local myexe="$(get_options "service")" - local myservice="${myexe##*/}" - - ebegin "Stopping ${myservice}" - rm -f ${svcdir}/options/xdm/service - - if [ "$(ps -A | grep -e "${myservice}")" ] - then - start-stop-daemon --stop --quiet \ - --exe ${myexe} &>/dev/null - - retval=$? - else - retval=1 - fi - - #switch back to original vt - chvt "${curvt}" &>/dev/null - eend ${retval} "Error stopping ${myservice}." - - return ${retval} -} - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.99.8/xfs.conf.d b/x11-base/xfree/files/4.3.99.8/xfs.conf.d deleted file mode 100644 index 21895e44e872..000000000000 --- a/x11-base/xfree/files/4.3.99.8/xfs.conf.d +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.99.8/xfs.conf.d,v 1.1 2003/07/11 22:54:09 spyderous Exp $ - -# Config file for /etc/init.d/xfs - - -# Port for xfs to listen on. Default is set to "-1", meaning -# it will only listen on unix sockets, and not tcp ports. If -# you however want it to listen on tcp, remember to comment -# "nolisten = tcp" in /etc/X11/fs/config. - -XFS_PORT="-1" - - -# If this is set to "yes", then the xfs rc-script will -# scan all the font directories in /etc/X11/fs/config for -# changes, and if any, will add the required files. This -# may take a while on very old boxes, so set it to "no" -# if it takes too long for you. - -SETUP_FONTDIRS="yes" - diff --git a/x11-base/xfree/files/4.3.99.8/xfs.config b/x11-base/xfree/files/4.3.99.8/xfs.config deleted file mode 100644 index e594a25183eb..000000000000 --- a/x11-base/xfree/files/4.3.99.8/xfs.config +++ /dev/null @@ -1,53 +0,0 @@ -# -# X Font Server configuration file -# - -# allow a max of 4 clients to connect to this font server -#client-limit = 4 - -# no tcp, use sockets! -no-listen = tcp - -# when a font server reaches its limit, start up a new one -clone-self = on - -# alternate font servers for clients to use -#alternate-servers = foo:7101,bar:7102 - -# where to look for fonts -# Some of these are commented out, i.e. the TrueType and Type1 -# directories in /usr/share, because they aren't forced to be -# installed alongside X. -# -catalogue = /usr/X11R6/lib/X11/fonts/75dpi, - /usr/X11R6/lib/X11/fonts/100dpi, - /usr/X11R6/lib/X11/fonts/misc, - /usr/X11R6/lib/X11/fonts/Type1, - /usr/X11R6/lib/X11/fonts/Speedo, - /usr/X11R6/lib/X11/fonts/CID, - /usr/X11R6/lib/X11/fonts/util, - /usr/X11R6/lib/X11/fonts/local, - /usr/X11R6/lib/X11/fonts/Speedo, - /usr/X11R6/lib/X11/fonts/truetype, - /usr/X11R6/lib/X11/fonts/TTF, - /usr/X11R6/lib/X11/fonts/cyrillic, - /usr/X11R6/lib/X11/fonts/freefont, - /usr/X11R6/lib/X11/fonts/sharefont, - /usr/share/fonts/default/Type1, - /usr/share/fonts/ttf/decoratives, - /usr/share/fonts/ttf/western - -# in 12 points, decipoints -default-point-size = 120 - -# 100 x 100 and 75 x 75 -default-resolutions = 75,75,100,100 - -# how to log errors -use-syslog = on - -# font cache control, specified in KB -cache-hi-mark = 2048 -cache-low-mark = 1433 -cache-balance = 70 - diff --git a/x11-base/xfree/files/4.3.99.8/xfs.start b/x11-base/xfree/files/4.3.99.8/xfs.start deleted file mode 100644 index 90acffb3e9ab..000000000000 --- a/x11-base/xfree/files/4.3.99.8/xfs.start +++ /dev/null @@ -1,296 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.99.8/xfs.start,v 1.1 2003/07/11 22:54:09 spyderous Exp $ - -#NB: Config is in /etc/conf.d/xfs - - -opts="${opts} mkfontdirs" - -depend() { - use logger -} - -check_config() { - if [ -z "${XFS_PORT}" ] - then - eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!" - return 1 - fi - return 0 -} - -# Return 0 on change, or 1 on no change, or if dir do not exist -check_changed() { - local x="" - local fontlist="" - - # If the dir do not exist, e - if [ ! -d $1 ] - then - return 1 - fi - - # Create a list of all non known config files in the font dir - fontlist="$(find $1/ -type f -maxdepth 1 | \ - gawk '$0 !~ /fonts\..*$|^.*\.dir$|XftCache/ {print}')" - - if [ ! -f $1/fonts.list ] - then - if [ -n "${fontlist}" ] - then - # No list file exist, so create it and return 0 to add - # this font dir as a candidate for updating... - echo "${fontlist}" > $1/fonts.list - - return 0 - fi - else - local retval=1 - - # All the fonts was removed, so cleanup - if [ -z "${fontlist}" ] - then - for x in $1/fonts.* $1/encodings.dir $1/XftCache - do - if [ -f ${x} ] - then - rm -f ${x} - fi - done - - return 1 - fi - - # Check that no files was added or removed.... - if [ "$(cat $1/fonts.list | md5sum)" != "$(echo "${fontlist}" | md5sum)" ] - then - retval=0 - fi - - # Check that no files was updated.... - if [ "${retval}" -ne 0 ] - then - local changed_list="" - -# It should be more consistant if we consider a change to fonts.scale, or -# encodings.dir files as a need for an update as well ... -# changed_list="$(find $1/ -type f -cnewer $1/fonts.dir | \ -# gawk '$0 !~ /fonts\..*$|^.*\.dir$|XftCache/ {print}')" - changed_list="$(find $1/ -type f -cnewer $1/fonts.dir | \ - gawk '$0 !~ /fonts\.(list|cache-1)$|XftCache/ {print}')" - - if [ -n "${changed_list}" ] - then - retval=0 - fi - fi - - # OK, something changed, so recreate fonts.list and add as candidate - # for updating... - if [ "${retval}" -eq 0 ] - then - echo "${fontlist}" > $1/fonts.list - - return 0 - fi - fi - - return 1 -} - -# This is a function to extract font dirs from -# the xfs config file (/etc/X11/fs/config). -get_fontdir_list() { - [ ! -r /etc/X11/fs/config ] && return 0 - - gawk ' - BEGIN { - - while((getline xfsconf_data < ("/etc/X11/fs/config")) > 0) { - - # Strip any comments - if (xfsconf_data !~ /^[[:space:]]*#/) { - - # Dont bother if its a blank line - if (xfsconf_data == "") continue - - # If we have a line that contain 'catalogue=', we - # should be where the list of font dirs are - if (xfsconf_data ~ /catalogue[[:space:]]*=/) - DO_WRITE = 1 - - # Ok, we got our que, so start - if (DO_WRITE) { - - # Strip any leading spaces and tabs - sub(/^[[:space:]]*/, "", xfsconf_data) - # Strip the 'catalogue=' part - sub(/catalogue[[:space:]]*=[[:space:]]*/, "", xfsconf_data) - - # The last font dir will not have a ',', so this will - # be the last line we read ... - if (xfsconf_data !~ /,$/) { - - DO_WRITE = 0 - DONE = 1 - } - - # Strip the ending ',' ... - sub(/,$/, "", xfsconf_data) - - # If we have a valid font path, print it - if (xfsconf_data != "") { - - have_dup = 0 - - # Check for duplicates ... - for (x in DIRLIST) - if (DIRLIST[x] == xfsconf_data) { - - have_dup = 1 - break - } - - if (!have_dup) { - print xfsconf_data - DIRLIST[++i] = xfsconf_data - } - } - } - - # No need to continue reading the file ... - if (DONE) break - } - } - - close("/etc/X11/fs/config") - }' - - return 0 -} - -# This is the main beast for setting up the font dirs -setup_font_dirs() { - local x="" - local pending_fontdirs="" - local changed="no" - - umask 022 - - if [ ! -x /usr/X11R6/bin/mkfontdir -o ! -x /usr/X11R6/bin/ttmkfdir ] - then - ewarn "Could not find the mkfontdir or ttmkfdir binaries!" - return 0 - fi - - if [ ! -d /usr/X11R6/lib/X11/fonts/encodings ] - then - ewarn "Encodings directory are missing!" - ewarn "Please restore /usr/X11R6/lib/X11/fonts/encodings ..." - return 0 - fi - - # Generate the encodings.dir ... - /usr/X11R6/bin/mkfontdir -n \ - -e /usr/X11R6/lib/X11/fonts/encodings \ - -e /usr/X11R6/lib/X11/fonts/encodings/large \ - -- /usr/X11R6/lib/X11/fonts/encodings - - ebegin "Scanning font directories" - for x in $(get_fontdir_list) - do - if test -d ${x} && check_changed ${x} - then - if [ -z "${pending_fontdirs}" ] - then - pending_fontdirs="${x}" - else - pending_fontdirs="${pending_fontdirs} ${x}" - fi - fi - done - eend 0 - - if [ -n "${pending_fontdirs}" ] - then - ebegin "Indexing font directories" - for x in ${pending_fontdirs} - do - ebegin " ${x}" - - # Only generate .scale files if there are truetype fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - /usr/X11R6/bin/ttmkfdir -x 2 \ - -e /usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} > /dev/null - fi - - # Now generate fonts.dir files ... - if [ "${x/encodings}" = "${x}" ] - then - /usr/X11R6/bin/mkfontdir \ - -e /usr/X11R6/lib/X11/fonts/encodings \ - -e /usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${x} > /dev/null - fi - - if [ "${x/encodings}" = "${x}" -a -x /usr/X11R6/bin/xftcache ] && \ - [ -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - # xftcache is broken, but run it anyhow ... - /usr/X11R6/bin/xftcache ${x} &> /dev/null - fi - eend 0 - - changed="yes" - done - fi - - # While we at it, update fontconfig's cache as well - if [ -x /usr/bin/fc-cache -a "${changed}" = "yes" ] - then - ebegin "Updating FC cache" - HOME="/root" /usr/bin/fc-cache -f - eend 0 - fi -} - -mkfontdirs() { - setup_font_dirs -} - -start() { - check_config || return 1 - - if [ "${SETUP_FONTDIRS}" = "yes" ] - then - setup_font_dirs - fi - - ebegin "Starting X Font Server" - if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then - start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ - -- -daemon -config /etc/X11/fs/config \ - -droppriv -user xfs -port ${XFS_PORT} 1>&2 - else - start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \ - -- -daemon -config /etc/X11/fs/config \ - -port ${XFS_PORT} 1>&2 - fi - eend $? -} - -stop() { - ebegin "Stopping X Font Server" - start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2 - rm -rf /tmp/.font-unix - eend $? -} - - -# vim:ts=4 diff --git a/x11-base/xfree/files/4.3.99.8/xinitrc b/x11-base/xfree/files/4.3.99.8/xinitrc deleted file mode 100644 index 53cde32559d2..000000000000 --- a/x11-base/xfree/files/4.3.99.8/xinitrc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -xinitdir=/usr/X11R6/lib/X11/xinit -sysresources=$xinitdir/.Xresources -sysmodmap=$xinitdir/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# First try ~/.xinitrc -if [ -f "$HOME/.xinitrc" ]; then - XINITRC="$HOME/.xinitrc" - exec /bin/sh "$HOME/.xinitrc" -# If not present, try the system default -elif [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -# Failsafe -else - # start some nice programs - twm & - xclock -geometry 50x50-1+1 & - xterm -geometry 80x50+494+51 & - xterm -geometry 80x20+494-0 & - exec xterm -geometry 80x66+0+0 -name login -fi diff --git a/x11-base/xfree/files/4.3.99.8/xserver.pamd b/x11-base/xfree/files/4.3.99.8/xserver.pamd deleted file mode 100644 index 7ff11c4329e2..000000000000 --- a/x11-base/xfree/files/4.3.99.8/xserver.pamd +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient /lib/security/pam_rootok.so -# Next line you need console ownership to be able to start X -#auth required /lib/security/pam_console.so -auth required /lib/security/pam_permit.so - -account required /lib/security/pam_permit.so diff --git a/x11-base/xfree/files/digest-xfree-4.3.99.8 b/x11-base/xfree/files/digest-xfree-4.3.99.8 deleted file mode 100644 index 64b74db4b273..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.3.99.8 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 0def970388c4babc46a39da5e2f85ab4 XFree86-4.3.99.8.tar.bz2 41816446 -MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811 -MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811 -MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 -MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 -MD5 4d5f5e19b563fed2eeeb9c5a51e76b58 sis_drv_src_110603-1.tar.gz 389120 -MD5 a5a77a87fac3a7e02270a9514207bb5d XFree86-4.3.0-drivers-via-0.1.tar.bz2 79965 diff --git a/x11-base/xfree/xfree-4.3.99.8.ebuild b/x11-base/xfree/xfree-4.3.99.8.ebuild deleted file mode 100644 index b30a6e2b7d80..000000000000 --- a/x11-base/xfree/xfree-4.3.99.8.ebuild +++ /dev/null @@ -1,1110 +0,0 @@ -# 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.99.8.ebuild,v 1.6 2003/08/03 04:44:28 vapier 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 ... -RESTRICT="nostrip" - -IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6" -# USE="$USE nomirror" -filter-flags "-funroll-loops" - -ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -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 -# still having issues with optimizations, or with it not filtering bad -# combinations (protecting the user maybe from themselves) yet. -# -# This can clearly be seen in large builds like glibc, where too aggressive -# CFLAGS cause the tests to fail miserbly. -# -# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion -# knows what he is talking about: -# -# People really shouldn't force code-specific options on... It's a -# bad idea. The -march options aren't just to look pretty. They enable -# options that are sensible (and include sse,mmx,3dnow when apropriate). -# -# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If -# you do not like it, comment it, but do not bugreport if you run into -# problems. -# -# <azarah@gentoo.org> (13 Oct 2002) -strip-flags - -# Needed by kdebase on hppa -[ "${ARCH}" = "hppa" ] && append-flags -fPI - -# Are we using a snapshot ? -USE_SNAPSHOT="yes" - -NOMIRROR="1" - -PATCH_VER="2.1.3" -FT2_VER="2.1.4" -XCUR_VER="0.2" -SISDRV_VER="110603-1" -SAVDRV_VER="1.1.27t" -MGADRV_VER="1_3_0beta" -VIADRV_VER="0.1" - -BASE_PV="${PV}" -MY_SV="Free86-${BASE_PV}" -# XFree86-4.3.99.6.tar.bz2 - - -S="${WORKDIR}/xc" -#SRC_PATH0="ftp://ftp.fit.vutbr.cz/pub/XFree86/develsnaps" -SRC_PATH0="ftp://ftp.xfree86.org/pub/XFree86/develsnaps" - -HOMEPAGE="http://www.xfree.org" - -# Misc patches we may need to fetch .. -#X_PATCHES="mirror://gentoo/XFree86-4.3.0-patches-${PATCH_VER}.tar.bz2" - -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 - 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 )" -# Updated Wacom driver: http://people.mandrakesoft.com/~flepied/projects/wacom/ -# Latest Savaga drivers: http://www.probo.com/timr/savage40.html -# Latest SIS drivers: http://www.winischhofer.net/ -# Glide headers for compiling the tdfx modules - -# For the MS Core fonts .. -MS_COREFONTS="./andale32.exe ./arial32.exe - ./arialb32.exe ./comic32.exe - ./courie32.exe ./georgi32.exe - ./impact32.exe ./times32.exe - ./trebuc32.exe ./verdan32.exe - ./webdin32.exe" -# ./IELPKTH.CAB" -# Need windows license to use this one -MS_FONT_URLS="${MS_COREFONTS//\.\//mirror://sourceforge/corefonts/}" - -SRC_URI="${SRC_PATH0}/X${MY_SV}.tar.bz2 - mirror://gentoo/eurofonts-X11.tar.bz2 - mirror://gentoo/xfsft-encodings.tar.bz2 - ${X_DRIVERS}" -# ${X_PATCHES}" - -# cyfred: These appeard to be integrated already. -# mirror://gentoo/XFree86-compose.dir-0.1.bz2 -# mirror://gentoo/XFree86-en_US.UTF-8.old.bz2 -# mirror://gentoo/XFree86-locale.alias.bz2 -# mirror://gentoo/XFree86-locale.dir.bz2 - - -LICENSE="X11 MSttfEULA" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm" - -DEPEND=">=sys-apps/baselayout-1.8.3 - >=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-${FT2_VER} - >=media-libs/fontconfig-2.1-r1 - >=x11-base/opengl-update-1.4 - >=x11-misc/ttmkfdir-3.0.4 - >=sys-apps/sed-4 - dev-lang/perl - media-libs/libpng - app-arch/unzip - pam? ( >=sys-libs/pam-0.75 ) - truetype? ( app-arch/cabextract ) - !x11-libs/xft" -#RDEPEND="$DEPEND" -# unzip - needed for savage driver (version 1.1.27t) -# x11-libs/xft -- blocked because of interference with xfree's - -PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )" - -PROVIDE="virtual/x11 - virtual/opengl - virtual/glu - virtual/xft" - -#inherit needs to happen *after* DEPEND has been defined to have "newdepend" -#do the right thing. Otherwise RDEPEND doesn't get set properly. -inherit eutils flag-o-matic gcc - - - -DESCRIPTION="Xfree86: famous and free X server" - -PATCH_DIR=${WORKDIR}/patch - -src_unpack() { - - # Unpack source and patches - unpack X${MY_SV}.tar.bz2 - #unpack XFree86-4.3.0-patches-${PATCH_VER}.tar.bz2 - - # cyfred:: - # Apply patch to create xc/exports/lib - # Apply patch to redirect libXau.a locations - cd ${S} - epatch ${FILESDIR}/${PV}/exports-lib.patch - cd ${S}/programs/Xserver/ - epatch ${FILESDIR}/${PV}/AuthLib.patch - - cd ${S} - # cyfred: im still going through the entire patchset and - # am under the impression that somethings still arent good so - # im only applying the acecad patch for the time being to make - # sure the build is successful. - # UPDATE:: These patches from 4.3.0 cause problems all over - # am removing totally for just the one for now. - epatch ${FILESDIR}/${PV}/acecad.patch - -if false; -then - - # Unpack TaD's gentoo cursors - unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - - # Unpack extra fonts stuff from Mandrake - if [ -n "`use nls`" ] - then - unpack gemini-koi8-u.tar.bz2 - fi - unpack eurofonts-X11.tar.bz2 - unpack xfsft-encodings.tar.bz2 - - # Remove bum encoding - rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc - - # Update the Savage Driver - # savage driver 1.1.27t is a .zip and contains a savage directory - # (that's why we have to be in drivers, not in savage subdir). - # Could be USE flag based - - ebegin "Updating Savage driver" - cd ${S}/programs/Xserver/hw/xfree86/drivers - unzip -oqq ${DISTDIR}/savage-${SAVDRV_VER}.zip || die - ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ - ${S}/programs/Xserver/hw/xfree86/drivers/savage - cd ${S} - eend 0 - - ebegin "Updating SiS driver" - cd ${S}/programs/Xserver/hw/xfree86/drivers/sis - tar -zxf ${DISTDIR}/sis_drv_src_${SISDRV_VER}.tar.gz || die - ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ - ${S}/programs/Xserver/hw/xfree86/drivers/sis - cd ${S} - eend 0 - - ebegin "Adding VIA driver" - cd ${WORKDIR} - unpack XFree86-${PV}-drivers-via-${VIADRV_VER}.tar.bz2 - cd ${S} - eend 0 - -# ebegin "Updating Matrox HAL driver" -# unpack mga-${MGADRV_VER}.tgz -# touch ${WORKDIR}/mga/HALlib/mgaHALlib.a -# mv ${WORKDIR}/mga/HALlib/mgaHALlib.a \ -# #{S}/programs/Xserver/hw/xfree86/drivers/mga/HALlib -# eend 0 - - if [ "`gcc-version`" = "2.95" ] - then - # Do not apply this patch for gcc-2.95.3, as it cause compile to fail, - # closing bug #10146. - mv -f ${PATCH_DIR}/0138_all_4.2.1-gcc32-internal-compiler-error.patch \ - ${PATCH_DIR}/excluded - - mv -f ${PATCH_DIR}/0260_ia64_4.2.99.1-gcc3.1.patch \ - ${PATCH_DIR}/excluded - fi - - if [ -z "`use debug`" ] - then - mv -f ${PATCH_DIR}/5901* ${PATCH_DIR}/excluded - else - mv -f ${PATCH_DIR}/0120* ${PATCH_DIR}/excluded - mv -f ${PATCH_DIR}/0127* ${PATCH_DIR}/excluded - fi -# FIXME: bug #19812, 075 should be deprecated by 076, left as -# TDFX_RISKY for feedback (put in -r3 if no problems) - if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ] - then - mv -f ${PATCH_DIR}/5850* ${PATCH_DIR}/excluded - else - mv -f ${PATCH_DIR}/5851* ${PATCH_DIR}/excluded - fi - - if [ -z "`use ipv6`" ] - then - mv -f ${PATCH_DIR}/200* ${PATCH_DIR}/excluded - else - if [ -z "`use doc`" ] - then - mv -f ${PATCH_DIR}/2001* ${PATCH_DIR}/excluded - fi - fi - - unset EPATCH_EXCLUDE - - # Update Wacom Driver, hopefully resolving bug #1632 - # The kernel driver should prob also be updated, this can be - # found at: - # - # http://people.mandrakesoft.com/~flepied/projects/wacom/ - # - if [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - ebegin "Updating Wacom USB Driver" - gzip -dc ${DISTDIR}/xf86Wacom.c.gz > \ - ${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die - eend 0 - fi -fi - - # Unpack the MS fonts - if [ -n "`use truetype`" ] - then - einfo "Unpacking MS Core Fonts..." - mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype - for x in ${MS_COREFONTS} - do - if [ -f ${DISTDIR}/${x} ] - then - einfo " ${x/\.\/}..." - cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die - fi - done - ebegin "Done unpacking Core Fonts"; eend 0 - fi - - ebegin "Setting up config/cf/host.def" - cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die - echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \ - >> config/cf/host.def - - # Xwrapper has been removed so we now need to use the set uid server - # again, this mustve happened somewhere after 4.3.0 in the development. - echo "#define InstallXserverSetUID YES" >> config/cf/host.def - echo "#define BuildServersOnly NO" >> config/cf/host.def - - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - - if [ "`gcc-version`" != "2.95" ] - then - # Should fix bug #4189. gcc-3.x have problems with -march=pentium4 - # and -march=athlon-tbird - if [ "`gcc-version`" != "3.3" ] - then - replace-flags "-march=pentium4" "-march=pentium3" - replace-flags "-march=athlon-tbird" "-march=athlon" - fi - - # Without this, modules breaks with gcc3 - if [ "`gcc-version`" = "3.1" ] - then - append-flags "-fno-merge-constants" - append-flags "-fno-merge-constants" - fi - fi - - if [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - echo "#define HasLinuxInput YES" >> config/cf/host.def - fi - - echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def - if [ -n "`use debug`" ] - then - echo "#define XFree86Devel YES" >> config/cf/host.def - echo "#define DoLoadableServer NO" >>config/cf/host.def - else - echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def - - # use less ram .. got this from Spider's makeedit.eclass :) - echo "#define GccWarningOptions -Wno-return-type -w" \ - >> config/cf/host.def - fi - - if [ -n "`use pam`" ] - then - # If you want to have optional pam support, do it properly ... - echo "#define HasPam YES" >> config/cf/host.def - echo "#define HasPamMisc YES" >> config/cf/host.def - else - echo "#define HasPam NO" >> config/cf/host.def - echo "#define HasPamMisc NO" >> config/cf/host.def - fi - - if [ -n "`use nls`" ] - then - echo "#define XtermWithI18N YES" >> config/cf/host.def - fi - - if [ "${ARCH}" = "x86" ] - then - # optimize Mesa for architecture - if [ -n "`use mmx`" ] - then - echo "#define HasMMXSupport YES" >> config/cf/host.def - echo "#define MesaUseMMX YES" >> config/cf/host.def - else - echo "#define HasMMXSupport NO" >> config/cf/host.def - echo "#define MesaUseMMX NO" >> config/cf/host.def - fi - if [ -n "`use 3dnow`" ] - then - echo "#define Has3DNowSupport YES" >> config/cf/host.def - echo "#define MesaUse3DNow YES" >> config/cf/host.def - else - echo "#define Has3DNowSupport NO" >> config/cf/host.def - echo "#define MesaUse3DNow NO" >> config/cf/host.def - fi - if [ -n "`use sse`" ] - then - echo "#define HasKatmaiSupport YES" >> config/cf/host.def - echo "#define MesaUseKatmai YES" >> config/cf/host.def - else - echo "#define HasKatmaiSupport NO" >> config/cf/host.def - echo "#define MesaUseKatmai NO" >> config/cf/host.def - fi - - # build with glide3 support? (build the tdfx_dri.o module) - if [ -n "`use 3dfx`" ] - then - echo "#define HasGlide3 YES" >> config/cf/host.def - fi - - # Compile the VIA driver - echo "#define XF86ExtraCardDrivers via" >> config/cf/host.def - fi - - if [ "${ARCH}" = "hppa" ] - then - echo "#define DoLoadableServer NO" >> config/cf/host.def - fi - - if [ "${ARCH}" = "alpha" ] - then - echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \ - i740 tdfx cirrus tseng fbdev \ - ati vga v4l glint" >> config/cf/host.def - fi - - if [ "${ARCH}" = "ppc" ] - then - echo "#define XF86CardDrivers mga glint s3virge sis savage trident \ - chips tdfx fbdev ati DevelDrivers vga nv imstt \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> config/cf/host.def - fi - - if [ "${ARCH}" = "sparc" ] - then - echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers" >> config/cf/host.def - fi - - if [ -n "`use xml2`" ] - then - echo "#define HasLibxml2 YES" >> config/cf/host.def - fi - - # The definitions for fontconfig - echo "#define UseFontconfig YES" >> config/cf/host.def - echo "#define HasFontconfig YES" >> config/cf/host.def - - # Use the xfree Xft2 lib - echo "#define SharedLibXft YES" >> config/cf/host.def - - # disable docs if doc not in USE - if [ -z "`use doc`" ] - then - echo "#define BuildLinuxDocText NO" >> config/cf/host.def - echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def - echo "#define BuildLinuxDocPS NO" >> config/cf/host.def - echo "#define BuildSpecsDocs NO" >> config/cf/host.def - fi - - # enable Japanese docs, optionally - if [ -n "`use cjk`" -a -n "`use doc`" ] - then - echo "#define InstallJapaneseDocs YES" >> config/cf/host.def - fi - - # Native Language Support Fonts - if [ -z "`use nls`" ] - then - echo "#define BuildCyrillicFonts NO" >> config/cf/host.def - echo "#define BuildArabicFonts NO" >> config/cf/host.def - echo "#define BuildGreekFonts NO" >> config/cf/host.def - echo "#define BuildHebrewFonts NO" >> config/cf/host.def - echo "#define BuildThaiFonts NO" >> config/cf/host.def - - if [ -z "`use cjk`" ] - then - echo "#define BuildCIDFonts NO" >> config/cf/host.def - echo "#define BuildJapaneseFonts NO" >> config/cf/host.def - echo "#define BuildKoreanFonts NO" >> config/cf/host.def - echo "#define BuildChineseFonts NO" >> config/cf/host.def - fi - fi - - if [ "`use ipv6`" ] - then - echo "#define HasIPv6 YES" >> config/cf/host.def - fi - -# # Build with the binary MatroxHAL driver -# echo "#define HaveMatroxHal YES" >> config/cf/host.def -# echo "#define UseMatroxHal YES" >> config/cf/host.def - -# Will uncomment this after kde, qt, and *box ebuilds are alterered to use -# it -# if use xinerama -# then -# echo "#define BuildXinerama YES" >> config/cf/host.def -# echo "#define BuildXineramaLibrary YES" >> config/cf/host.def -# fi - - # End the host.def definitions here - eend 0 - - cd ${S} - if use doc - then - # These are not included anymore as they are obsolete - rm -rf ${S}/doc/hardcopy/{XIE,PEX5} - for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config} - do - if [ -f ${x} ] - then - cp ${x} ${x}.orig - grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x} - rm -f ${x}.orig - fi - done - fi - -} - -src_compile() { - - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - - # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of - # MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the - # xfree build will silently die. This is tricky to track down, so I'm - # adding a preemptive fix for this issue by making sure that MAKE_OPTS is - # unset. (drobbins, 08 Mar 2003) - unset MAKE_OPTS - - einfo "Building XFree86..." - FAST=1 emake World || die - - if [ -n "`use nls`" ] - then - cd ${S}/nls - make || die - cd ${S} - fi -} - -src_install() { - - unset MAKE_OPTS - - einfo "Installing XFree86..." - # gcc3 related fix. Do this during install, so that our - # whole build will not be compiled without mmx instructions. - if [ "`gcc-version`" != "2.95" ] && [ "${ARCH}" = "x86" ] - then - make install DESTDIR=${D} || \ - make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ - CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install DESTDIR=${D} || die - else - make install DESTDIR=${D} || die - fi - - # We do not want these, so remove them ... - rm -rf ${D}/usr/X11R6/include/fontconfig - rm -f ${D}/usr/X11R6/lib/libfontconfig.* - rm -f ${D}/usr/X11R6/bin/{fontconfig-config,fc-cache,fc-list} - rm -f ${D}/usr/X11R6/man/man3/fontconfig.3x* - rm -rf ${D}/etc/fonts/ - - # This one needs to be in /usr/lib - insinto /usr/lib/pkgconfig - doins ${D}/usr/X11R6/lib/pkgconfig/{xcursor,xft}.pc - # Now remove the invalid xft.pc, and co ... - rm -rf ${D}/usr/X11R6/lib/pkgconfig - - einfo "Installing man pages..." - make install.man DESTDIR=${D} || die - einfo "Compressing man pages..." - prepman /usr/X11R6 - - if [ -n "`use nls`" ] - then - cd ${S}/nls - make DESTDIR=${D} install || die - fi - - # Make sure the user running xterm can only write to utmp. - fowners root.utmp /usr/X11R6/bin/xterm - fperms 2755 /usr/X11R6/bin/xterm - - # Fix permissions on locale/common/*.so - for x in ${D}/usr/X11R6/lib/X11/locale/lib/common/*.so* - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # Fix permissions on modules ... - for x in $(find ${D}/usr/X11R6/lib/modules -name '*.o') \ - $(find ${D}/usr/X11R6/lib/modules -name '*.so') - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can - # mess up other things that use xmkmf - ebegin "Fixing lib/X11/config/host.def" - cp ${D}/usr/X11R6/lib/X11/config/host.def ${T} - awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \ - ${T}/host.def > ${D}/usr/X11R6/lib/X11/config/host.def - # theoretically, /usr/X11R6/lib/X11/config is a possible candidate for - # config file management. If we find that people really worry about imake - # stuff, we may add it. But for now, we leave the dir unprotected. - eend 0 - - insinto /etc/X11 - # We still use freetype for now ... - doins ${FILESDIR}/${PV}/XftConfig - newins ${FILESDIR}/${PV}/XftConfig XftConfig.new - # This is if we are using Fontconfig only ... - #newins ${S}/lib/Xft1/XftConfig-OBSOLETE XftConfig - dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig - - # Install example config file - newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example - - # Install MS fonts. - if [ -n "`use truetype`" ] - then - ebegin "Installing MS Core Fonts" - dodir /usr/X11R6/lib/X11/fonts/truetype - cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype - eend 0 - fi - - # EURO support - ebegin "Euro Support..." - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz - eend 0 - - # Standard symlinks - dodir /usr/{bin,include,lib} - dosym ../X11R6/bin /usr/bin/X11 - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/DPS /usr/include/DPS - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 - dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb - - # Some critical directories - keepdir /var/lib/xdm - dosym ../../../var/lib/xdm /etc/X11/xdm/authdir - - # Remove invalid symlinks - rm -f ${D}/usr/lib/libGL.* - # Create required symlinks - dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so - dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so.1 - dosym libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so - # We move libGLU to /usr/lib now - dosym libGLU.so.1.3 /usr/lib/libMesaGLU.so - - # .la files for libtool support - insinto /usr/X11R6/lib - doins ${FILESDIR}/${PV}/lib/*.la - - # Remove libz.a, as it causes problems (bug #4777) - rm -f ${D}/usr/X11R6/lib/libz.a - # And do not forget the includes (bug #9470) - rm -f ${D}/usr/X11R6/include/{zconf.h,zlib.h} - - # Use the Xwrapper as the X binary - #rm -f ${D}/usr/X11R6/bin/X - #dosym Xwrapper /usr/X11R6/bin/X - dosym ../../usr/X11R6/bin/XFree86 /etc/X11/X - - # Fix perms - fperms 755 /usr/X11R6/lib/X11/xkb/geometry/sgi - fperms 755 /usr/X11R6/bin/dga - - # Hack from Mandrake (update ours that just created Compose files for - # all locales) - for x in $(find ${D}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) - do - # make empty Compose files for some locales - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - C|microsoft-*|iso8859-*|koi8-*) - if [ ! -f ${x}/Compose ] - then - touch ${x}/Compose - fi - ;; - ja*|ko*|zh*) - if [ -r ${x}/Compose ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Another hack from Mandrake -- to fix dead + space for the us - # international keyboard - for i in ${D}/usr/X11R6/lib/X11/locale/*/Compose - do - sed -i \ - -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \ - -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" \ - ${i} - done - - # Yet more Mandrake - ebegin "Encoding files for xfsft font server..." - dodir /usr/X11R6/lib/X11/fonts/encodings - cp -a ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/* \ - ${D}/usr/X11R6/lib/X11/fonts/encodings - - for x in ${D}/usr/X11R6/lib/X11/fonts/encodings/{.,large}/*.enc - do - [ -f "${x}" ] && gzip -9 -f ${x} - done - eend 0 - - if [ -n "`use nls`" ] - then - ebegin "gemini-koi8 fonts..." - cd ${WORKDIR}/ukr - gunzip *.Z - gzip -9 *.pcf - cd ${S} - cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts - eend 0 - fi - - exeinto /etc/X11 - # new session management script - doexe ${FILESDIR}/${PV}/chooser.sh - # new display manager script - doexe ${FILESDIR}/${PV}/startDM.sh - exeinto /etc/X11/Sessions - for x in ${FILESDIR}/${PV}/Sessions/* - do - [ -f ${x} ] && doexe ${x} - done - insinto /etc/env.d - doins ${FILESDIR}/${PV}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/${PV}/xinitrc - exeinto /etc/X11/xdm - doexe ${FILESDIR}/${PV}/Xsession ${FILESDIR}/${PV}/Xsetup_0 - insinto /etc/X11/fs - newins ${FILESDIR}/${PV}/xfs.config config - if [ -n "`use pam`" ] - then - insinto /etc/pam.d - newins ${FILESDIR}/${PV}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILESDIR}/${PV}/xserver.pamd xserver - fi - exeinto /etc/init.d - newexe ${FILESDIR}/${PV}/xdm.start xdm - newexe ${FILESDIR}/${PV}/xfs.start xfs - insinto /etc/conf.d - newins ${FILESDIR}/${PV}/xfs.conf.d xfs - - # we want libGLU.so* in /usr/lib - mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib - - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/lib/opengl/xfree/{lib,extensions,include} - local x="" - for x in ${D}/usr/X11R6/lib/libGL.so* \ - ${D}/usr/X11R6/lib/libGL.la \ - ${D}/usr/X11R6/lib/libGL.a \ - ${D}/usr/X11R6/lib/libMesaGL.so - do - if [ -f ${x} -o -L ${x} ] - then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/lib/opengl/xfree/lib - fi - done - for x in ${D}/usr/X11R6/lib/modules/extensions/libglx* - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/lib/opengl/xfree/extensions - fi - done - for x in ${D}/usr/X11R6/include/GL/{gl.h,glx.h,glxtokens.h} - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/lib/opengl/xfree/include - fi - done - eend 0 - - # Make the core cursor the default. People seem not to like whiteglass - # for some reason. - dosed 's:whiteglass:core:' /usr/share/cursors/xfree/default/index.theme - - einfo "Striping binaries and libraries..." - # This bit I got from Redhat ... strip binaries and drivers .. - # NOTE: We do NOT want to strip the drivers, modules or DRI modules! - for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \ - grep -v ' shared object,' | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p') - do - if [ -f ${x} ] - then - # Dont do the modules ... - if [ "${x/\/usr\/X11R6\/lib\/modules}" = "${x}" ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip ${x} || : - fi - fi - done - # Now do the libraries ... - for x in ${D}/usr/{lib,lib/opengl/xfree/lib}/*.so.* \ - ${D}/usr/X11R6/{lib,lib/X11/locale/lib/common}/*.so.* - do - if [ -f ${x} ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip --strip-debug ${x} || : - fi - done - - # Install TaD's gentoo cursors - insinto /usr/share/cursors/xfree/gentoo/cursors - doins ${WORKDIR}/cursors/gentoo/cursors/* - insinto /usr/share/cursors/xfree/gentoo-blue/cursors - doins ${WORKDIR}/cursors/gentoo-blue/cursors/* - insinto /usr/share/cursors/xfree/gentoo-silver/cursors - doins ${WORKDIR}/cursors/gentoo-silver/cursors/* -} - -pkg_preinst() { - - # These changed from a directory/file to a symlink and reverse - if [ ! -L ${ROOT}/usr/X11R6/lib/X11/XftConfig ] && \ - [ -f ${ROOT}/usr/X11R6/lib/X11/XftConfig ] - then - rm -rf ${ROOT}/usr/X11R6/lib/X11/XftConfig - fi - - if [ -L ${ROOT}/etc/X11/app-defaults ] - then - rm -f ${ROOT}/etc/X11/app-defaults - fi - - if [ ! -L ${ROOT}/usr/X11R6/lib/X11/app-defaults ] && \ - [ -d ${ROOT}/usr/X11R6/lib/X11/app-defaults ] - then - if [ ! -d ${ROOT}/etc/X11/app-defaults ] - then - mkdir -p ${ROOT}/etc/X11/app-defaults - fi - - mv -f ${ROOT}/usr/X11R6/lib/X11/app-defaults ${ROOT}/etc/X11 - fi - - if [ -L ${ROOT}/usr/X11R6/lib/X11/xkb ] - then - rm -f ${ROOT}/usr/X11R6/lib/X11/xkb - fi - - if [ ! -L ${ROOT}/etc/X11/xkb ] && \ - [ -d ${ROOT}/etc/X11/xkb ] - then - if [ ! -d ${ROOT}/usr/X11R6/lib/X11/xkb ] - then - mkdir -p ${ROOT}/usr/X11R6/lib/X11 - fi - - mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11 - fi - - # clean the dinamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d ${ROOT}/usr/lib/opengl/xfree ] - then - rm -rf ${ROOT}/usr/lib/opengl/xfree/* - fi - - # clean out old fonts.* and encodings.dir files, as we - # will regenerate them - find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'fonts.*' \ - -exec rm -f {} \; - find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'encodings.dir' \ - -exec rm -f {} \; - - # make sure we do not have any stale files lying round - # that could break things. - rm -f ${ROOT}/usr/X11R6/lib/libGL* -} - -update_XftConfig() { - - if [ "${ROOT}" = "/" ] - then - local CHECK1="f901d29ec6e3cbb0a5b0fd5cbdd9ff33" - local CHECK2="$(md5sum ${ROOT}/etc/X11/XftConfig | cut -d ' ' -f1)" - - if [ "${CHECK1}" = "${CHECK2}" ] - then - echo - ewarn "Due to an invalid /etc/X11/XftConfig from x11-base/xfree-4.2.1," - ewarn "/etc/X11/XftConfig is being updated automatically. Your old" - ewarn "version of /etc/X11/XftConfig will be backed up as:" - ewarn - ewarn " ${ROOT}etc/X11/XftConfig.bak" - echo - - cp -a ${ROOT}/etc/X11/XftConfig \ - ${ROOT}/etc/X11/XftConfig.bak - mv -f ${ROOT}/etc/X11/XftConfig.new \ - ${ROOT}/etc/X11/XftConfig - rm -f ${ROOT}/etc/X11/._cfg????_XftConfig - else - rm -f ${ROOT}/etc/X11/XftConfig.new - fi - fi -} - - -pkg_postinst() { - - env-update - - if [ "${ROOT}" = "/" ] - then - local x="" - - umask 022 - - # This one cause ttmkfdir to segfault :/ - #rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz - - # ******************************************************************** - # A note about fonts and needed files: - # - # 1) Create /usr/X11R6/lib/X11/fonts/encodings/encodings.dir - # - # 2) Create font.scale for TrueType fonts (need to do this before - # we create fonts.dir files, else fonts.dir files will be - # invalid for TrueType fonts...) - # - # 3) Now Generate fonts.dir files. - # - # CID fonts is a bit more involved, but as we do not install any, - # thus I am not going to bother. - # - # <azarah@gentoo.org> (20 Oct 2002) - # - # ******************************************************************** - - ebegin "Generating encodings.dir..." - # Create the encodings.dir in /usr/X11R6/lib/X11/fonts/encodings - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontdir -n \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${ROOT}/usr/X11R6/lib/X11/fonts/encodings - eend 0 - - if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ] - then - ebegin "Creating fonts.scale files..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate .scale files if there are truetype - # fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - ${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} - fi - done - eend 0 - fi - - ebegin "Generating fonts.dir files..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - if [ "${x/encodings}" = "${x}" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontdir \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ - -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating Xft Cache..." - for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate XftCache files if there are truetype - # fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/xftcache ${x} &> /dev/null - fi - done - eend 0 - - ebegin "Fixing permissions..." - find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \ - -exec chmod 0644 {} \; - eend 0 - - # danarmak found out that fc-cache should be run AFTER all the above - # stuff, as otherwise the cache is invalid, and has to be run again - # as root anyway - if [ -x ${ROOT}/usr/bin/fc-cache ] - then - ebegin "Creating FC font cache..." - HOME="/root" ${ROOT}/usr/bin/fc-cache -f - eend 0 - fi - - # Switch to the xfree implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo; ${ROOT}/usr/sbin/opengl-update --use-old xfree - fi - - for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) - do - # Remove old compose files we might have created incorrectly - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - ja*|ko*|zh*) - if [ -r "${x}/Compose" ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Update /etc/X11/XftConfig if its the one from Xft1.2, as its - # invalid for Xft1.1 .... - # NOTE: This should not be needed for xfree-4.2.99 or later, - # but lets not take chances with people that may downgrade - # at a later stage .... - update_XftConfig - - # These need to be owned by root and the correct permissions - # (bug #8281) - for x in ${ROOT}/tmp/.{ICE,X11}-unix - do - if [ ! -d ${x} ] - then - mkdir -p ${x} - fi - - chown root:root ${x} - chmod 1777 ${x} - done - - if [ "`use 3dfx`" ] - then - echo - einfo "If using a 3DFX card, and you had \"3dfx\" in your USE flags," - einfo "please merge media-libs/glide-v3 if you have not done so yet" - einfo "by doing:" - einfo - einfo " # emerge media-libs/glide-v3" - echo - fi - echo - ewarn "BEWARE 1:" - ewarn "This version of XFree won't work with ati-drivers-2.5.1-r1" - ewarn "if you are using them please unmerge ati-drivers" - ewarn " and emerge xfree-drm" - echo - ewarn "BEWARE 2:" - ewarn "If you experience font corruption on OpenOffice.org or similar" - ewarn "glitches please remake your XF86Config" - echo - - einfo "Please note that the xcursors are in /usr/share/cursors/xfree" - einfo "Any custom cursor sets should be placed in that directory" - einfo "This is different from the previous versions of 4.3 and" - einfo "the 4.2.99 series." - 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 settings" - echo - -} - -pkg_postrm() { - - # Fix problematic links - if [ -x ${ROOT}/usr/X11R6/bin/XFree86 ] - then - ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11 - ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 - ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS - ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 - fi -} |