diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-12-09 21:24:28 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-12-09 21:24:28 +0000 |
| commit | 3e88cd6d55f9ac7fda6c01cd5bcacdba5280aee6 (patch) | |
| tree | eb790bf7dcaaea9d54ba99af77ece654dad20ff5 /x11-base | |
| parent | Unmasking java-config (diff) | |
| download | gentoo-2-3e88cd6d55f9ac7fda6c01cd5bcacdba5280aee6.tar.gz gentoo-2-3e88cd6d55f9ac7fda6c01cd5bcacdba5280aee6.tar.bz2 gentoo-2-3e88cd6d55f9ac7fda6c01cd5bcacdba5280aee6.zip | |
Xft2.0 fixes
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.1-r2.ebuild | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 86b9e142d1d0..eedc7a9e14b6 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,9 +1,14 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.67 2002/12/09 04:41:17 manson Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.68 2002/12/09 21:24:28 azarah Exp $ -\* Autoupdate keywords (12-6-02) - 06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords + 09 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : + + Also do not overwrite Xft headers if Xft2.0 are installed. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : + + Changed sparc ~sparc keywords. *xfree-4.2.1-r2 (05 Dec 2002) diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild index d096bc7032cd..f060ed573a49 100644 --- a/x11-base/xfree/xfree-4.2.1-r2.ebuild +++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 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.2 2002/12/09 04:41:17 manson Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.3 2002/12/09 21:24:28 azarah Exp $ IUSE="sse nls mmx truetype 3dnow 3dfx" @@ -407,7 +407,7 @@ src_install() { insinto /usr/X11R6/lib doins ${FILESDIR}/${PVR}/lib/*.la - # Do not overwrite /usr/X11R6/lib/libXft.so if we have Xft2.0 installed ... + # 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`" @@ -415,7 +415,12 @@ src_install() { 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 |