diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2004-02-09 22:26:43 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-02-09 22:26:43 +0000 |
| commit | 2e6cb1812a362a3ea43d87b53a1ba022e44c1dda (patch) | |
| tree | 2b5addb180232b25076113699df99b0aee3cc420 /x11-base | |
| parent | set ppc in keywords (diff) | |
| download | historical-2e6cb1812a362a3ea43d87b53a1ba022e44c1dda.tar.gz historical-2e6cb1812a362a3ea43d87b53a1ba022e44c1dda.tar.bz2 historical-2e6cb1812a362a3ea43d87b53a1ba022e44c1dda.zip | |
Pulling vulnerable versions.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xfree/Manifest | 14 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.2.1-r2 | 22 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.0-r2 | 31 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.99.902 | 20 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.1-r2.ebuild | 831 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r2.ebuild | 1074 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.99.902.ebuild | 1077 |
8 files changed, 9 insertions, 3066 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 5bb02401dc33..4329d2ecb449 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.279 2004/02/09 21:53:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.280 2004/02/09 22:26:43 spyderous Exp $ + + 09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild, + xfree-4.3.0-r2.ebuild, xfree-4.3.99.902.ebuild: + Pulling vulnerable versions. 09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; : Fix ChangeLog entries. diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest index c7b16c3049d8..e18b1d4fbfe9 100644 --- a/x11-base/xfree/Manifest +++ b/x11-base/xfree/Manifest @@ -1,18 +1,12 @@ +MD5 310f36915e12de7f2c2af3690fa076fc ChangeLog 63297 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228 -MD5 4659979dd6b6b35aca44cb28e3a21f60 xfree-4.3.99.902.ebuild 31182 -MD5 460ff929c007dc7f7799fa3eb85942cd xfree-4.2.1-r2.ebuild 23613 -MD5 9203acfd76594ffe6ffdf37ebdd41c80 xfree-4.3.0-r4.ebuild 34713 -MD5 d88e3d60ca8e77906b1556710eacce0e xfree-4.3.0-r2.ebuild 31527 -MD5 be1ec1d373af229ed882a3e5bb3c2c93 xfree-4.3.0-r3.ebuild 34747 MD5 00179dfeed2fd3f82ffabb1a73098664 xfree-4.2.1-r3.ebuild 23612 -MD5 1c323948c02081a922b97770b100565a ChangeLog 63137 +MD5 be1ec1d373af229ed882a3e5bb3c2c93 xfree-4.3.0-r3.ebuild 34747 +MD5 9203acfd76594ffe6ffdf37ebdd41c80 xfree-4.3.0-r4.ebuild 34713 MD5 d43a587eccc98eb79a11c7f2b707bf02 xfree-4.3.99.902-r1.ebuild 31188 -MD5 5a482320482c76552022a45b3fc282ff files/digest-xfree-4.3.99.902 1254 MD5 1dab1996678f325cc30eacff0f2f475f files/digest-xfree-4.2.1-r3 1342 -MD5 11eab8d28c7a35e8265a7cc7245f246b files/digest-xfree-4.3.0-r4 2002 -MD5 7c78312b314118c4217fb71c2e3d9ad5 files/digest-xfree-4.2.1-r2 1342 -MD5 6a542004d031451f668989af76b28a0f files/digest-xfree-4.3.0-r2 1928 MD5 5aa0593eae1bc9dec93ac67a83843b52 files/digest-xfree-4.3.0-r3 2000 +MD5 11eab8d28c7a35e8265a7cc7245f246b files/digest-xfree-4.3.0-r4 2002 MD5 6b12a8aff58278c2b6e3cafd12ffb3b2 files/digest-xfree-4.3.99.902-r1 1254 MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750 MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182 diff --git a/x11-base/xfree/files/digest-xfree-4.2.1-r2 b/x11-base/xfree/files/digest-xfree-4.2.1-r2 deleted file mode 100644 index 494577b7f911..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.2.1-r2 +++ /dev/null @@ -1,22 +0,0 @@ -MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532 -MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328 -MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679 -MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661 -MD5 38adc94a4953a6b29e8619c25dda4887 4.2.0-4.2.1.diff.gz 54763 -MD5 b39c9764f155e204f4edc05dc6260eb6 XFree86-4.2.1-patches-1.4.tar.bz2 405078 -MD5 12179b90b41b35f9f03f93968613cb05 XFree86-4.2.1-files-0.1.tar.bz2 34199 -MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 -MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 -MD5 4550c4f28637be556e2000676072de32 sis_drv_src_311003-1.tar.gz 419840 -MD5 aaeb8f8b276a6849f7a570097d69788e glide3-headers.tar.bz2 14564 -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 deleted file mode 100644 index 2257594e9847..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.3.0-r2 +++ /dev/null @@ -1,31 +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 419358e4a082a8a7a3d4e93ab22fb820 XFree86-4.3.0-patches-1.1.8.tar.bz2 431795 -MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 -MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 -MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 -MD5 4550c4f28637be556e2000676072de32 sis_drv_src_311003-1.tar.gz 419840 -MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 -MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811 -MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811 -MD5 4c7920d4b9d2ff1213faff4d718946d6 XFree86-compose.dir-0.1.bz2 1877 -MD5 aafd74e26c541382bb382ff338f81f87 XFree86-en_US.UTF-8.old.bz2 7068 -MD5 2e2263bb4adaee6f959fbb6c8df5336a XFree86-locale.alias.bz2 3592 -MD5 d4402be729da91e849aa5b9f506bda06 XFree86-locale.dir.bz2 2094 -MD5 3585b8924a92d3dab36db8912d2a0581 gentoo-cursors-tad-0.2.tar.bz2 1203605 -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.99.902 b/x11-base/xfree/files/digest-xfree-4.3.99.902 deleted file mode 100644 index 566b998816ab..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.3.99.902 +++ /dev/null @@ -1,20 +0,0 @@ -MD5 eec2d5e4b980ec73a7772b9362ed9021 XFree86-4.3.99.902.tar.bz2 41992616 -MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811 -MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811 -MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991 -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 -MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 -MD5 41725543cce9a2e417f92f0425f46bc2 XFree86-4.3.99.902-files-0.1.tar.bz2 10772 -MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 -MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 -MD5 37af6335410eaaec3f541e5c144ec78a XFree86-4.3.99.902-patches-0.3.tar.bz2 88034 diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild deleted file mode 100644 index bec4f180cada..000000000000 --- a/x11-base/xfree/xfree-4.2.1-r2.ebuild +++ /dev/null @@ -1,831 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.37 2004/01/27 18:48:06 spyderous Exp $ - -# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure -# that only we only strip stuff that are safe to strip ... -RESTRICT="nostrip" - -IUSE="sse nls mmx truetype 3dnow 3dfx" - -inherit eutils flag-o-matic gcc - -filter-flags "-funroll-loops" - -# Sparc support -replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc" -replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9" - -# 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. -# -# 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 - -PATCH_VER="1.4" -FILES_VER="0.1" -FT2_VER="2.1.2" -FC2_VER="2.1" -SISDRV_VER="311003-1" -SAVDRV_VER="1.1.27t" - -PATCH_DIR="${WORKDIR}/patch" -FILES_DIR="${WORKDIR}/files" - -BASE_PV="4.2.0" -MY_SV="${BASE_PV//\.}" -S="${WORKDIR}/xc" -S_XFT2="${WORKDIR}/fcpackage.${FC2_VER/\./_}/Xft" -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" -HOMEPAGE="http://www.xfree.org" - -X_PATCHES="http://ftp.xfree86.org/pub/XFree86/${PV}/patches/${BASE_PV}-${PV}.diff.gz - mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2" - -X_FILES="mirror://gentoo/XFree86-${PV}-files-${FILES_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 - 3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )" -# Updated Wacom driver at http://people.mandrakesoft.com/~flepied/projects/wacom/ -# Latest Savaga drivers at http://www.probo.com/timr/savage40.html -# Latest SIS drivers at 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}src-1.tgz - ${SRC_PATH0}/X${MY_SV}src-2.tgz - ${SRC_PATH0}/X${MY_SV}src-3.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 - http://fontconfig.org/release/fcpackage.${FC2_VER/\./_}.tar.gz - ${X_PATCHES} - ${X_FILES} - ${X_DRIVERS} - truetype? ( ${MS_FONT_URLS} )" - -LICENSE="X11 MSttfEULA" -SLOT="0" -KEYWORDS="x86 ppc sparc alpha" - -DEPEND=">=sys-apps/baselayout-1.8.3 - >=sys-libs/ncurses-5.1 - >=sys-libs/pam-0.75 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - dev-lang/perl - >=media-libs/freetype-${FT2_VER}-r2 - >=x11-base/opengl-update-1.4 - >=x11-misc/ttmkfdir-2.0 - truetype? ( app-arch/cabextract ) - app-arch/unzip" # needed for savage driver (version 1.1.27t) - -RDEPEND=">=sys-apps/baselayout-1.8.3 - >=sys-libs/ncurses-5.1 - >=sys-libs/pam-0.75 - >=sys-libs/zlib-1.1.3-r2 - >=media-libs/freetype-${FT2_VER}-r2 - >=media-libs/fontconfig-2.1 - >=x11-base/opengl-update-1.4" -# Above fontconfig is just to make sure user have a fixed version installed. - -PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )" - -PROVIDE="virtual/x11 - virtual/opengl - virtual/glu" - -src_unpack() { - - unpack X${MY_SV}src-{1,2,3}.tgz \ - fcpackage.${FC2_VER/\./_}.tar.gz \ - XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 \ - XFree86-${PV}-files-${FILES_VER}.tar.bz2 - - # Fix permissions - chmod -R 0755 ${WORKDIR}/fcpackage.${FC2_VER/\./_}/ - - # Install the glide3 headers for compiling the tdfx driver - if [ -n "`use 3dfx`" ] - 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 - fi - - # Update to XFree86-4.2.1 tree - cd ${S}; - EPATCH_SINGLE_MSG="Updating ${BASE_PV} sources to ${PV}..." \ - epatch ${DISTDIR}/${BASE_PV}-${PV}.diff.gz - eend 0 - - ebegin "Updating Xrender" - cd ${S}; rm -rf ${S}/lib/Xrender - mv ${WORKDIR}/fcpackage.${FC2_VER/\./_}/Xrender ${S}/lib/Xrender || die - # Get Xrender to also install its extension headers, as they need to - # be updated. - cp ${S}/lib/Xrender/Imakefile ${S}/lib/Xrender/Imakefile.orig - sed -e '2i NONSTANDARD_HEADERS = extutil.h region.h render.h renderproto.h' \ - ${S}/lib/Xrender/Imakefile.orig > ${S}/lib/Xrender/Imakefile - 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. - EPATCH_EXCLUDE="107_all_4.2.1-gcc32-internal-compiler-error.patch.bz2" - fi - - # Remove 082 patch which b0rks keycodes, - # see bug #13073 - rm -f ${PATCH_DIR}/082* - - # Do not disable DRI for 3dfx cards if resolution higher than 1024x768, - # bug #15001. - rm -f ${PATCH_DIR}/035* - - # Various Patches from all over - epatch ${PATCH_DIR} - unset EPATCH_EXCLUDE - - # Update the Savage Driver - ebegin "Updating Savage driver" - cd ${S}/programs/Xserver/hw/xfree86/drivers - unzip -qo ${DISTDIR}/savage-${SAVDRV_VER}.zip || die - 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 - eend 0 - - # 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 - - # 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 ${FILES_DIR}/site.def config/cf/host.def || die - echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \ - >> 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 - replace-flags "-march=pentium4" "-march=pentium3" - replace-flags "-march=athlon-tbird" "-march=athlon" - - # Without this, modules breaks with gcc3 - if [ "`gcc-version`" = "3.1" ] - then - export CFLAGS="${CFLAGS} -fno-merge-constants" - export CXXFLAGS="${CXXFLAGS} -fno-merge-constants" - fi - fi - echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def - if [ "${DEBUGBUILD}" != "yes" ] - then - # 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 [ "${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 - fi - if [ -n "`use 3dnow`" ] - then - echo "#define Has3DNowSupport YES" >> config/cf/host.def - echo "#define MesaUse3DNow YES" >> 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 - fi - fi - - if [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - echo "#define HasLinuxInput 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 - - if [ -n "`use nls`" ] - then - echo "#define XtermWithI18N YES" >> config/cf/host.def - fi - eend 0 - - # 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 -} - -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..." - emake World || die - - if [ -n "`use nls`" ] - then - cd ${S}/nls - make || die - 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 - - 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/common/*.so* - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # we zap the 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 ${FILES_DIR}/XftConfig - newins ${FILES_DIR}/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 - - # 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 ${FILES_DIR}/lib/*.la - - # Some Xft2.0 checks to ease things a bit - if [ -L ${ROOT}/usr/X11R6/lib/libXft.so ] - then - local libxft_link="`readlink ${ROOT}/usr/X11R6/lib/libXft.so`" - - if [ "${libxft_link##*/}" = "libXft.so.2.0" ] && \ - [ -f ${ROOT}/usr/lib/libXft.so.2.0 ] - then - # Do not overwrite /usr/X11R6/lib/libXft.so if we have - # Xft2.0 installed ... - rm -f ${D}/usr/X11R6/lib/libXft.so - - # Move Xft1.1 headers to not overwrite Xft2.0 headers ... - mv -f ${D}/usr/X11R6/include/X11/Xft ${D}/usr/X11R6/include/X11/Xft1 - fi - fi - - # 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} - - # 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 - - exeinto /etc/X11 - # new session management script - doexe ${FILES_DIR}/chooser.sh - # new display manager script - doexe ${FILES_DIR}/startDM.sh - exeinto /etc/X11/Sessions - for x in ${FILES_DIR}/Sessions/* - do - [ -f ${x} ] && doexe ${x} - done - insinto /etc/env.d - doins ${FILES_DIR}/10xfree - insinto /etc/X11/xinit - doins ${FILES_DIR}/xinitrc - exeinto /etc/X11/xdm - doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0 - insinto /etc/X11/fs - newins ${FILES_DIR}/xfs.config config - if [ -n "`use pam`" ] - then - insinto /etc/pam.d - newins ${FILES_DIR}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILES_DIR}/xserver.pamd xserver - fi - exeinto /etc/init.d - newexe ${FILES_DIR}/xdm.start xdm - newexe ${FILES_DIR}/xfs.start xfs - insinto /etc/conf.d - newins ${FILES_DIR}/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 - - 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 -} - -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 - - if [ -x ${ROOT}/usr/bin/fc-cache ] - then - ebegin "Creating FC font cache..." - HOME="/root" ${ROOT}/usr/bin/fc-cache -f - eend 0 - fi - - # 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 - - # 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 .... - 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 -} - -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 -} - diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild deleted file mode 100644 index 0185ab28eb76..000000000000 --- a/x11-base/xfree/xfree-4.3.0-r2.ebuild +++ /dev/null @@ -1,1074 +0,0 @@ -# Copyright 1999-2004 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-r2.ebuild,v 1.53 2004/02/06 12:54:20 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 xml truetype nls cjk doc bindist pam" - -# 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) - -# Are we using a snapshot ? -USE_SNAPSHOT="no" - -PATCH_VER="1.1.8" -FT2_VER="2.1.3" -XCUR_VER="0.2" -SISDRV_VER="311003-1" -SAVDRV_VER="1.1.27t" -MGADRV_VER="1_3_0beta" - -BASE_PV="${PV}" -MY_SV="${BASE_PV//\.}" -S="${WORKDIR}/xc" -SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${BASE_PV}/source" -SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source" -HOMEPAGE="http://www.xfree.org" - -# Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/${PV}/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 - http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz" -# 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}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_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 - doc? ( ${SRC_PATH0}/X${MY_SV}src-6.tgz - ${SRC_PATH0}/X${MY_SV}src-7.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} - nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) - mirror://gentoo/eurofonts-X11.tar.bz2 - mirror://gentoo/xfsft-encodings.tar.bz2 - 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 - mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - truetype? ( ${MS_FONT_URLS} )" - -LICENSE="X11 MSttfEULA" -SLOT="0" -KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa" - -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}-r2 - >=media-libs/fontconfig-2.1-r1 - >=x11-base/opengl-update-1.4 - >=x11-misc/ttmkfdir-3.0.4 - >=sys-apps/sed-4 - >=sys-devel/patch-2.5.9 - dev-lang/perl - media-libs/libpng - app-arch/unzip - pam? ( >=sys-libs/pam-0.75 ) - truetype? ( !bindist? ( 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="x86? ( 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" - -src_unpack() { - - # Unpack source and patches - unpack X${MY_SV}src-{1,2,3,4,5}.tgz - if [ -n "`use doc`" ] - then - unpack X${MY_SV}src-{6,7}.tgz - fi - unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 - - # 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 "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. - 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 - else - rm -f ${WORKDIR}/patch/120_all_4.2.99-parallel-make.patch - 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 - rm -f ${WORKDIR}/patch/075* - else - rm -f ${WORKDIR}/patch/076* - fi - - # Various Patches from all over - EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch/ - - unset EPATCH_EXCLUDE - - # 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: - # - # 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 - - # Unpack the MS fonts - if [ -n "`use truetype`" -a -z "`use bindist`" ] - 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 - - # 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 - - filter-flags -funroll-loops - ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O2 -O3 -pipe" - strip-flags - - # Needed by kdebase on hppa - [ "${ARCH}" = "hppa" ] && append-flags -fPIC - - # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml - has_version "sys-devel/hardened-gcc" && export CC="${CC} -yet_exec" - - # 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 - replace-flags "-march=pentium4" "-march=pentium3" - replace-flags "-march=athlon-tbird" "-march=athlon" - - # 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 CcCmd ${CC}" >> config/cf/host.def - 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 - 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 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 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 - - # 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 - -# # 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} - bzcat ${DISTDIR}/XFree86-compose.dir-0.1.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 - - 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..." - 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`" -a -z "`use bindist`" ] - 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." - -} - -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 -} diff --git a/x11-base/xfree/xfree-4.3.99.902.ebuild b/x11-base/xfree/xfree-4.3.99.902.ebuild deleted file mode 100644 index 040b72eb3b69..000000000000 --- a/x11-base/xfree/xfree-4.3.99.902.ebuild +++ /dev/null @@ -1,1077 +0,0 @@ -# Copyright 1999-2004 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.902.ebuild,v 1.9 2004/02/06 23:36:06 cyfred 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="sse mmx 3dnow" were disabled in favor of autodetection -# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004) -IUSE="3dfx cjk debug doc ipv6 nls pam sdk static truetype xml2" -# INPUT_DEVICES="synaptics" - -filter-flags "-funroll-loops" - -ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe -fomit-frame-pointer" - -# 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 - -# Are we using a snapshot ? -USE_SNAPSHOT="yes" - -FILES_VER="0.1" -PATCH_VER="0.3" -FT2_VER="2.1.4" -XCUR_VER="0.3.1" -SISDRV_VER="021203-1" -SAVDRV_VER="1.1.27t" -MGADRV_VER="1_3_0beta" -#VIADRV_VER="0.1" - -BASE_PV="${PV}" -MY_SV="XFree86-${BASE_PV}" - -S="${WORKDIR}/xc" -FILES_DIR="${WORKDIR}/files" -PATCH_DIR="${WORKDIR}/patch" - -SRC_PATH0="ftp://ftp.xfree86.org/pub/XFree86/develsnaps" - -HOMEPAGE="http://www.xfree.org" - -# Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/${PV}/XFree86-${PV}-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-${PV}-drivers-via-${VIADRV_VER}.tar.bz2 -# Updated Wacom driver: http://people.mandrakesoft.com/~flepied/projects/wacom/ -# Latest Savage drivers: http://www.probo.com/timr/savage40.html -# Latest SIS drivers: http://www.winischhofer.net/ - -# 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/}" - -GENTOO_FILES="http://dev.gentoo.org/~spyderous/xfree/patchsets/${PV}/XFree86-${PV}-files-${FILES_VER}.tar.bz2" - -SRC_URI="${SRC_PATH0}/${MY_SV}.tar.bz2 - mirror://gentoo/eurofonts-X11.tar.bz2 - mirror://gentoo/xfsft-encodings.tar.bz2 - mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - truetype? ( ${MS_FONT_URLS} ) - nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) - ${GENTOO_FILES} - ${X_DRIVERS} - ${X_PATCHES}" - -LICENSE="X11 MSttfEULA" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~amd64" - -# sys-apps/portage for USE_EXPAND -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 ) - >=sys-apps/portage-2.0.49-r13 - !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="x86? ( - 3dfx? ( >=media-libs/glide-v3-3.10 ) - input_devices_synaptics? ( x11-misc/synaptics ) - )" - -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 xfree - -DESCRIPTION="Xfree86: famous and free X server" - -src_unpack() { - - # Unpack source and patches - ebegin "Unpacking source" - unpack ${MY_SV}.tar.bz2 > /dev/null - eend 0 - - ebegin "Unpacking Gentoo files and patches" - unpack XFree86-${PV}-files-${FILES_VER}.tar.bz2 > /dev/null - unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 > /dev/null - eend 0 - - # Unpack TaD's gentoo cursors - ebegin "Unpacking Gentoo cursors" - unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > /dev/null - eend 0 - - # Unpack extra fonts stuff from Mandrake - ebegin "Unpacking fonts" - if use nls - then - unpack gemini-koi8-u.tar.bz2 > /dev/null - fi - unpack eurofonts-X11.tar.bz2 > /dev/null - unpack xfsft-encodings.tar.bz2 > /dev/null - eend 0 - - # 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 - unpack savage-${SAVDRV_VER}.zip > /dev/null - 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 -# unpack sis_drv_src_${SISDRV_VER}.tar.gz > /dev/null -# ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ -# ${S}/programs/Xserver/hw/xfree86/drivers/sis -# cd ${S} -# eend 0 - - # This patch is just plain broken. Results in random failures. - mv -f ${PATCH_DIR}/0120*parallel-make* ${PATCH_DIR}/excluded - - # Hardened patches (both broken) - mv -f ${PATCH_DIR}/9960_all_4.3.0-exec-shield-GNU* ${PATCH_DIR}/excluded - mv -f ${PATCH_DIR}/9961_all_4.3.0-libGL-exec-shield* ${PATCH_DIR}/excluded - - # We dont have an implementation for S/390's yet... - if [ ! "${ARCH}" = "s390" ] - then - mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded - fi - -# if [ ! "`use gatos`" ] -# then - mv -f ${PATCH_DIR}/9841_all_4.3.0-gatos-mesa* ${PATCH_DIR}/excluded -# fi - - if use debug - then - mv -f ${PATCH_DIR}/5901*acecad-debug* ${PATCH_DIR}/excluded - fi - - # Only apply for hppa/alpha (exclude for others) - if [ ! "${ARCH}" = "hppa" -o ! "${ARCH}" = "alpha" ] - then - mv -f ${PATCH_DIR}/0251*build-zlib-with-fpic* ${PATCH_DIR}/excluded - fi - - # TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's - 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 - - # Bulk patching - based on patch name - # Will create excluded stuff once it's needed - cd ${WORKDIR} - EPATCH_SUFFIX="patch" \ - epatch ${PATCH_DIR} - cd ${S} - - # 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 ( [ -e "/usr/src/linux" ] && \ - [ ! `is_kernel "2" "2"` ] ) || \ - [ "`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 - - # Unpack the MS fonts - if 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 ${FILES_DIR}/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 ( [ -e "/usr/src/linux" ] && \ - [ ! `is_kernel "2" "2"` ] ) || \ - [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - echo "#define HasLinuxInput YES" >> config/cf/host.def - fi - - echo "#define CcCmd ${CC}" >> config/cf/host.def - echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def - - if [ -n "`use debug`" -o -n "`use static`" ] - then - echo "#define DoLoadableServer NO" >>config/cf/host.def - fi - - if use debug - then - echo "#define XFree86Devel YES" >> 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 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 use nls - then - echo "#define XtermWithI18N YES" >> config/cf/host.def - fi - - if [ "${ARCH}" = "x86" ] - then - # build with glide3 support? (build the tdfx_dri.o module) - if use 3dfx - then - echo "#define HasGlide3 YES" >> config/cf/host.def - fi - 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 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 - - # Set up docs building - if use doc - then - local DOC="YES" - else - local DOC="NO" - fi - - # with USE="X doc' circular dep w/ virtual/ghostscript - # echo "#define HasGhostScript ${DOC}" >> config/cf/host.def - echo "#define BuildLinuxDocText ${DOC}" >> config/cf/host.def - echo "#define BuildLinuxDocHtml ${DOC}" >> config/cf/host.def - echo "#define BuildLinuxDocPS ${DOC}" >> config/cf/host.def - echo "#define BuildSpecsDocs ${DOC}" >> config/cf/host.def - echo "#define BuildHtmlManPages ${DOC}" >> config/cf/host.def - - # enable Japanese docs, optionally - if use cjk - then - echo "#define InstallJapaneseDocs ${DOC}" >> 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 BuildIPv6 YES" >> config/cf/host.def - else - echo "#define BuildIPv6 NO" >> config/cf/host.def - fi - - # 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 WORLDOPTS="" || die - - if 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 - - if use sdk # || use gatos - then - einfo "Installing XFree86 SDK..." - make install.sdk DESTDIR=${D} || die - fi - - # 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 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 ${FILES_DIR}/XftConfig - newins ${FILES_DIR}/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 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..." - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-10x20.bdf | \ - gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-10x20-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 ${FILES_DIR}/lib/*.la - - # Use the server as the X binary now as the wrapper is gone. - 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 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 ${FILES_DIR}/chooser.sh - # new display manager script - doexe ${FILES_DIR}/startDM.sh - exeinto /etc/X11/Sessions - for x in ${FILES_DIR}/Sessions/* - do - [ -f ${x} ] && doexe ${x} - done - insinto /etc/env.d - doins ${FILES_DIR}/10xfree - insinto /etc/X11/xinit - doins ${FILES_DIR}/xinitrc - exeinto /etc/X11/xdm - doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0 - insinto /etc/X11/fs - newins ${FILES_DIR}/xfs.config config - if use pam - then - insinto /etc/pam.d - newins ${FILES_DIR}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILES_DIR}/xserver.pamd xserver - fi - exeinto /etc/init.d - newexe ${FILES_DIR}/xdm.start xdm - newexe ${FILES_DIR}/xfs.start xfs - insinto /etc/conf.d - newins ${FILES_DIR}/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 "Stripping 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 - rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/iso8859-6.8x.enc.gz - rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/iso8859-6.16.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 - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${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." - echo - 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 - einfo "Listening on ipv4 is disabled by default with startx." - einfo "To enable it or disable ipv6, edit /usr/X11R6/bin/startx." -} - -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 -} |