diff options
| -rw-r--r-- | x11-base/xfree/ChangeLog | 13 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.0 | 22 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.0-r2 | 156 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r2.ebuild (renamed from x11-base/xfree/xfree-4.3.0.ebuild) | 337 |
4 files changed, 400 insertions, 128 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 9ad7e4656ff0..7209a6df0999 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,17 @@ # 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.117 2003/04/06 03:00:10 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.118 2003/04/08 22:33:39 seemant Exp $ + +*xfree-4.3.0-r2 (08 Apr 2003) + + 08 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild, + xfree-4.3.0.ebuild, xfree-4.3.0.ebuild: + many fixes in this ebuild -- using the old keymaps from 4.2 to sort out the + keymap situation. Added patches from Mandrake. Additionally, this uses + Xwrapper so normal X binaries are not installed SUID. Added additional + european fonts and asien fonts, and freetype encodings for X font server. The + next -r version will have the ability to slim down the compile a little bit, + and only install the drivers needed 24 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild, xfree-4.3.0-r1.ebuild : diff --git a/x11-base/xfree/files/digest-xfree-4.3.0 b/x11-base/xfree/files/digest-xfree-4.3.0 deleted file mode 100644 index 784babfb7f4d..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.3.0 +++ /dev/null @@ -1,22 +0,0 @@ -MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622 -MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239 -MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363 -MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091 -MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018 -MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919 -MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 -MD5 4ecbe985e304445695dc82af0a532988 XFree86-4.2.99.4-patches-1.1.tar.bz2 232640 -MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 -MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 -MD5 8fe0419ad622053ae0e98f42c23ac3d5 sis_drv_src_141202-1.tar.gz 317440 -MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384 -MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208 -MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176 -MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008 -MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368 -MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440 -MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288 -MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728 -MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200 -MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992 -MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072 diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r2 b/x11-base/xfree/files/digest-xfree-4.3.0-r2 new file mode 100644 index 000000000000..9bb498c8d8f8 --- /dev/null +++ b/x11-base/xfree/files/digest-xfree-4.3.0-r2 @@ -0,0 +1,156 @@ +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 25fa70f09b18dfd16ba4ae464a0efa32 /xfree-4.3.0-r2.ebuild 28952 +MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622 +MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239 +MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363 +MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091 +MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018 +MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919 +MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 +MD5 4c1a6475842cc869f4ab5ee911ef63fc XFree86-4.3.0-patches-1.0.tar.bz2 428352 +MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 +MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 +MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 +MD5 3001d660c8d43a6da0c53737d969424d sis_drv_src_060403-1.tar.gz 378880 +MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 +MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811 +MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811 +MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384 +MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208 +MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176 +MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008 +MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368 +MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440 +MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288 +MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728 +MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200 +MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992 +MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072 diff --git a/x11-base/xfree/xfree-4.3.0.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild index 5dc1861327d1..c4a70a86538b 100644 --- a/x11-base/xfree/xfree-4.3.0.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0.ebuild,v 1.8 2003/03/20 15:25:06 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.1 2003/04/08 22:33:39 seemant 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 ... DEBUG="yes" RESTRICT="nostrip" -IUSE="sse nls mmx truetype 3dnow 3dfx" +IUSE="savage sis 3dfx sse mmx 3dnow xml truetype" inherit eutils flag-o-matic gcc @@ -16,7 +16,7 @@ filter-flags "-funroll-loops" # 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 himeself) yet. +# 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. @@ -38,9 +38,9 @@ strip-flags # Are we using a snapshot ? USE_SNAPSHOT="no" -PATCH_VER="1.1" +PATCH_VER="1.0" FT2_VER="2.1.3" -SISDRV_VER="141202-1" +SISDRV_VER="060403-1" SAVDRV_VER="1.1.27t" BASE_PV="${PV}" @@ -49,12 +49,11 @@ S="${WORKDIR}/xc" DESCRIPTION="Xfree86: famous and free X server" SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${BASE_PV}/source" SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source" -# If we are using CVS snapshots made by Seemant ... -SRC_PATH_SS="http://www.ibiblio.org/gentoo/gentoo-sources" HOMEPAGE="http://www.xfree.org" # Misc patches we may need to fetch .. -X_PATCHES="mirror://gentoo/XFree86-4.2.99.4-patches-${PATCH_VER}.tar.bz2" +X_PATCHES="mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 + http://www.cpbotha.net/files/dri_resume/xfree86-dri-resume-v8.patch" X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz http://www.probo.com/timr/savage-${SAVDRV_VER}.zip @@ -76,36 +75,32 @@ MS_COREFONTS="./andale32.exe ./arial32.exe # Need windows license to use this one MS_FONT_URLS="${MS_COREFONTS//\.\//mirror://sourceforge/corefonts/}" -if [ "${USE_SNAPSHOT}" = "yes" ] -then - SRC_URI="${SRC_PATH_SS}/X${BASE_PV}-1.tar.bz2 - ${SRC_PATH_SS}/X${BASE_PV}-2.tar.bz2 - ${SRC_PATH_SS}/X${BASE_PV}-3.tar.bz2 - ${SRC_PATH_SS}/X${BASE_PV}-4.tar.bz2" -else - SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz - ${SRC_PATH0}/X${MY_SV}src-2.tgz - ${SRC_PATH0}/X${MY_SV}src-3.tgz - ${SRC_PATH0}/X${MY_SV}src-4.tgz - ${SRC_PATH0}/X${MY_SV}src-5.tgz - ${SRC_PATH0}/X${MY_SV}src-6.tgz - ${SRC_PATH0}/X${MY_SV}src-7.tgz - ${SRC_PATH1}/X${MY_SV}src-1.tgz - ${SRC_PATH1}/X${MY_SV}src-2.tgz - ${SRC_PATH1}/X${MY_SV}src-3.tgz - ${SRC_PATH1}/X${MY_SV}src-4.tgz - ${SRC_PATH1}/X${MY_SV}src-5.tgz - ${SRC_PATH1}/X${MY_SV}src-6.tgz - ${SRC_PATH1}/X${MY_SV}src-7.tgz" -fi +SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz + ${SRC_PATH0}/X${MY_SV}src-2.tgz + ${SRC_PATH0}/X${MY_SV}src-3.tgz + ${SRC_PATH0}/X${MY_SV}src-4.tgz + ${SRC_PATH0}/X${MY_SV}src-5.tgz + ${SRC_PATH0}/X${MY_SV}src-6.tgz + ${SRC_PATH0}/X${MY_SV}src-7.tgz + ${SRC_PATH1}/X${MY_SV}src-1.tgz + ${SRC_PATH1}/X${MY_SV}src-2.tgz + ${SRC_PATH1}/X${MY_SV}src-3.tgz + ${SRC_PATH1}/X${MY_SV}src-4.tgz + ${SRC_PATH1}/X${MY_SV}src-5.tgz + ${SRC_PATH1}/X${MY_SV}src-6.tgz + ${SRC_PATH1}/X${MY_SV}src-7.tgz" + SRC_URI="${SRC_URI} ${X_PATCHES} ${X_DRIVERS} + mirror://gentoo/gemini-koi8-u.tar.bz2 + mirror://gentoo/eurofonts-X11.tar.bz2 + mirror://gentoo/xfsft-encodings.tar.bz2 truetype? ( ${MS_FONT_URLS} )" LICENSE="X11 MSttfEULA" SLOT="0" -KEYWORDS="~x86 ppc ~sparc ~alpha ~mips hppa" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa arm" DEPEND=">=sys-apps/baselayout-1.8.3 >=sys-libs/ncurses-5.1 @@ -142,25 +137,47 @@ PROVIDE="virtual/x11 src_unpack() { - if [ "${USE_SNAPSHOT}" = "yes" ] - then - unpack X${BASE_PV}-{1,2,3,4}.tar.bz2 - else - unpack X${MY_SV}src-{1,2,3,4,5,6,7}.tgz - fi - - unpack XFree86-4.2.99.4-patches-${PATCH_VER}.tar.bz2 + # Unpack source and patches + unpack X${MY_SV}src-{1,2,3,4,5,6,7}.tgz + unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 - # Install the glide3 headers for compiling the tdfx driver -# if [ -n "`use 3dfx`" ] + # Unpack extra fonts stuff from Mandrake + unpack gemini-koi8-u.tar.bz2 + unpack eurofonts-X11.tar.bz2 + unpack xfsft-encodings.tar.bz2 + + # remove bum font + 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 +# if [ -n "`use savage`" ] # then -# ebegin "Installing tempory glide3 headers" -# cd ${WORKDIR}; unpack glide3-headers.tar.bz2 -# cp -f ${S}/lib/GL/mesa/src/drv/tdfx/Imakefile ${T} -# sed -e 's:$(GLIDE3INCDIR):$(WORKDIR)/glide3:g' \ -# ${T}/Imakefile > ${S}/lib/GL/mesa/src/drv/tdfx/Imakefile -# eend 0 + 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 +# else +# rm -f ${WORKDIR}/patch/30* +# fi + + # Update the SIS Driver +# if [ -n "`use sis`" ] +# then + 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 # fi + if [ "`gcc-version`" = "2.95" ] then @@ -168,36 +185,21 @@ src_unpack() { # closing bug #10146. EPATCH_EXCLUDE="107_all_4.2.1-gcc32-internal-compiler-error.patch.bz2" fi + + if [ -z "`use debug`" ] + then + rm -f ${WORKDIR}/patch/202_all_4.2.99.3-acecad-debug.patch.bz2 + fi + # Various Patches from all over epatch ${WORKDIR}/patch/ + unset EPATCH_EXCLUDE - # enable the nv driver on ppc - if use ppc; then - epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-enable-nv-on-ppc.patch - fi - - # Fix HOME and END keys to work in xterm, bug #15254 - epatch ${FILESDIR}/xfree-4.2.x-home_end-keys.patch - - # 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). - 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 - eend 0 - - # Update the SIS Driver -# 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 -# eend 0 - + # Fix DRI related problems + cd ${S}/programs/Xserver/hw/xfree86/ + epatch ${DISTDIR}/xfree86-dri-resume-v8.patch + # Update Wacom Driver, hopefully resolving bug #1632 # The kernel driver should prob also be updated, this can be # found at: @@ -229,10 +231,15 @@ src_unpack() { fi ebegin "Setting up config/cf/host.def" - cd ${S}; cp ${FILESDIR}/${PVR}/site.def config/cf/host.def || die + 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 + # We're using Xwrapper instead -- so that nothing else needs to be + # set uid any more. + echo "#define InstallXserverSetUID NO" >> config/cf/host.def + echo "#define BuildServersOnly NO" >> config/cf/host.def + # Bug #12775 .. fails with -Os. replace-flags "-Os" "-O2" @@ -250,12 +257,23 @@ src_unpack() { export CXXFLAGS="${CXXFLAGS} -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 [ "${DEBUGBUILD}" != "yes" ] + 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 + echo "#define GccWarningOptions -Wno-return-type -w" \ + >> config/cf/host.def fi if [ -n "`use pam`" ] @@ -268,6 +286,11 @@ src_unpack() { 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 @@ -286,28 +309,49 @@ src_unpack() { echo "#define HasKatmaiSupport YES" >> config/cf/host.def echo "#define MesaUseKatmai YES" >> 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 fi - if [ "`uname -r | cut -d. -f1,2`" != "2.2" ] + if [ "${ARCH}" = "hppa" ] then - echo "#define HasLinuxInput YES" >> config/cf/host.def + echo "#define DoLoadableServer NO" >> config/cf/host.def fi - # build with glide3 support? (build the tdfx_dri.o module) - if [ -n "`use 3dfx`" ] + if [ "${ARCH}" = "alpha" ] then - echo "#define HasGlide3 YES" >> config/cf/host.def + echo "#define XF86CardDrivers mga nv tga s3virge sis rendition neomagic i170 tdfx cirrus tseng trident chips apm fbdev ati vga v4l glint" \ + >> config/cf/host.def fi - if [ -n "`use nls`" ] + if [ "${ARCH}" = "ppc" ] then - echo "#define XtermWithI18N YES" >> config/cf/host.def + echo "#define XF86CardDrivers mga glint s3virge sis savage trident chips tdfx fbdev ati DevelDrivers vga nv XF86OSCardDrivers XF86ExtraCardDrivers" \ + >> config/cf/host.def fi - [ "${ARCH}" = "hppa" ] && echo "#define DoLoadableServer NO" >> config/cf/host.def - + if [ -n "`use xml`" ] + 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 + + # End the host.def definitions here eend 0 + cd ${S} + bzcat ${DISTDIR}/XFree86-compose.dir.bz2 > nls/compose.dir + bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias + bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir + bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8 + # 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} @@ -326,10 +370,11 @@ 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) + # 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..." @@ -339,7 +384,36 @@ src_compile() { then cd ${S}/nls make || die + cd ${S} fi + + ebegin "Fixing documentation..." + find xc/doc/hardcopy -name '*.PS.Z' | xargs gzip -df + find xc/doc/hardcopy -name '*.PS' | xargs gzip -f + + groff -Tascii -ms xc/doc/misc/RELNOTES.ms > xc/doc/hardcopy/RELNOTES.txt + groff -Tascii -ms xc/doc/specs/BDF/bdf.ms > xc/doc/hardcopy/BDF/bdf.txt + groff -Tascii -ms xc/doc/specs/CTEXT/ctext.tbl.ms >xc/doc/hardcopy/CTEXT/ctext.tbl.txt + groff -Tascii -ms xc/doc/specs/FSProtocol/protocol.ms >xc/doc/hardcopy/FSProtocol/protocol.txt + groff -Tascii -ms xc/doc/specs/ICCCM/icccm.ms >xc/doc/hardcopy/ICCCM/icccm.txt + groff -Tascii -ms xc/doc/specs/ICE/ICElib.ms >xc/doc/hardcopy/ICE/ICElib.txt + groff -Tascii -ms xc/doc/specs/ICE/ice.ms > xc/doc/hardcopy/ICE/ice.txt + cp xc/doc/specs/PM/PM_spec xc/doc/hardcopy/ICE + groff -Tascii -ms xc/doc/specs/SM/SMlib.ms > xc/doc/hardcopy/SM/SMlib.txt + groff -Tascii -ms xc/doc/specs/XDMCP/xdmcp.ms >xc/doc/hardcopy/XDMCP/xdmcp.txt + groff -Tascii -ms xc/doc/specs/XIM/xim.ms > xc/doc/hardcopy/XIM/xim.txt + groff -Tascii -ms xc/doc/specs/XLFD/xlfd.tbl.ms >xc/doc/hardcopy/XLFD/xlfd.tbl.txt + + rm -rf xc/doc/hardcopy/BSD/* + rm -rf xc/doc/hardcopy/CTEXT/* + rm -rf xc/doc/hardcopy/FSProtocol/* + rm -rf xc/doc/hardcopy/ICCCM/* + rm -rf xc/doc/hardcopy/ICE/* + rm -rf xc/doc/hardcopy/SM/* + rm -rf xc/doc/hardcopy/XDMCP/* + rm -rf xc/doc/hardcopy/XIM/* + rm -rf xc/doc/hardcopy/XLFD/* + eend 0 } src_install() { @@ -366,7 +440,7 @@ src_install() { rm -f ${D}/usr/X11R6/man/man3/Xft.3x* rm -rf ${D}/usr/X11R6/include/fontconfig rm -f ${D}/usr/X11R6/lib/libfontconfig.* - rm -f ${D}/usr/X11R6/bin/fontconfig-config + 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/ @@ -423,8 +497,8 @@ src_install() { insinto /etc/X11 # We still use freetype for now ... - doins ${FILESDIR}/${PVR}/XftConfig - newins ${FILESDIR}/${PVR}/XftConfig XftConfig.new + 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 @@ -441,6 +515,14 @@ src_install() { 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 + # Change the silly red pointer to a white one ... dosed 's:redglass:whiteglass:' /usr/X11R6/lib/X11/icons/default/index.theme @@ -468,13 +550,22 @@ src_install() { # .la files for libtool support insinto /usr/X11R6/lib - doins ${FILESDIR}/${PVR}/lib/*.la + 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) @@ -497,36 +588,66 @@ src_install() { 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 + + gzip -9 -f ${D}/usr/X11R6/lib/X11/fonts/encodings/*.enc +# gzip -9 -f ${D}/usr/X11R6/lib/X11/fonts/encodings/large/*.enc + eend 0 + + 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 + + + exeinto /etc/X11 # new session management script - doexe ${FILESDIR}/${PVR}/chooser.sh + doexe ${FILESDIR}/${PV}/chooser.sh # new display manager script - doexe ${FILESDIR}/${PVR}/startDM.sh + doexe ${FILESDIR}/${PV}/startDM.sh exeinto /etc/X11/Sessions - for x in ${FILESDIR}/${PVR}/Sessions/* + for x in ${FILESDIR}/${PV}/Sessions/* do [ -f ${x} ] && doexe ${x} done insinto /etc/env.d - doins ${FILESDIR}/${PVR}/10xfree + doins ${FILESDIR}/${PV}/10xfree insinto /etc/X11/xinit - doins ${FILESDIR}/${PVR}/xinitrc + doins ${FILESDIR}/${PV}/xinitrc exeinto /etc/X11/xdm - doexe ${FILESDIR}/${PVR}/Xsession ${FILESDIR}/${PVR}/Xsetup_0 + doexe ${FILESDIR}/${PV}/Xsession ${FILESDIR}/${PV}/Xsetup_0 insinto /etc/X11/fs - newins ${FILESDIR}/${PVR}/xfs.config config + newins ${FILESDIR}/${PV}/xfs.config config if [ -n "`use pam`" ] then insinto /etc/pam.d - newins ${FILESDIR}/${PVR}/xdm.pamd xdm + newins ${FILESDIR}/${PV}/xdm.pamd xdm # Need to fix console permissions first - newins ${FILESDIR}/${PVR}/xserver.pamd xserver + newins ${FILESDIR}/${PV}/xserver.pamd xserver fi exeinto /etc/init.d - newexe ${FILESDIR}/${PVR}/xdm.start xdm - newexe ${FILESDIR}/${PVR}/xfs.start xfs + newexe ${FILESDIR}/${PV}/xdm.start xdm + newexe ${FILESDIR}/${PV}/xfs.start xfs insinto /etc/conf.d - newins ${FILESDIR}/${PVR}/xfs.conf.d xfs + newins ${FILESDIR}/${PV}/xfs.conf.d xfs # we want libGLU.so* in /usr/lib mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib @@ -727,6 +848,12 @@ pkg_postinst() { -- ${ROOT}/usr/X11R6/lib/X11/fonts/encodings eend 0 + ebegin "Generating koi8 fonts..." + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ + ${ROOT}/usr/X11R6/bin/mkfontdir \ + ${ROOT}/usr/X11R6/lib/X11/fonts/ukr + eend 0 + if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ] then ebegin "Creating fonts.scale files..." |