diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-12-01 22:39:27 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-12-01 22:39:27 +0000 |
| commit | 82b7bd6717e68ae039475372259af8014c635938 (patch) | |
| tree | 307219d0d01148163b59dfa4b169b77105c7ed99 /x11-libs | |
| parent | New mailx ebuild ported from the openbsd cvs repository pulled (diff) | |
| download | historical-82b7bd6717e68ae039475372259af8014c635938.tar.gz historical-82b7bd6717e68ae039475372259af8014c635938.tar.bz2 historical-82b7bd6717e68ae039475372259af8014c635938.zip | |
some misc fixes
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/xft/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/xft/xft-2.0-r1.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/x11-libs/xft/ChangeLog b/x11-libs/xft/ChangeLog index 1827d1a24995..ec99d74bf63d 100644 --- a/x11-libs/xft/ChangeLog +++ b/x11-libs/xft/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/xft # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.4 2002/11/21 22:18:05 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.5 2002/12/01 22:39:27 azarah Exp $ + + 02 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xft-2.0-r1.ebuild : + Do not backup /usr/X11R6/include/X11/Xft if /root/.Xft already exist. + Make /usr/X11R6/lib/libXft.so a relative symlink. *xft-2.0-r1 (19 Nov 2002) diff --git a/x11-libs/xft/xft-2.0-r1.ebuild b/x11-libs/xft/xft-2.0-r1.ebuild index f17c3cb9fd51..b0089987189e 100644 --- a/x11-libs/xft/xft-2.0-r1.ebuild +++ b/x11-libs/xft/xft-2.0-r1.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-libs/xft/xft-2.0-r1.ebuild,v 1.4 2002/12/01 19:04:11 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0-r1.ebuild,v 1.5 2002/12/01 22:39:27 azarah Exp $ PROVIDE="virtual/xft" DESCRIPTION="Xft2" @@ -12,7 +12,7 @@ KEYWORDS="x86" IUSE="" RDEPEND="x11-base/xfree - media-libs/fontconfig" + >=media-libs/fontconfig-2.0-r4" DEPEND="${RDEPEND} >=sys-devel/autoconf-2.53a" @@ -39,11 +39,14 @@ src_install() { datadir=${D}/usr/share || die dodir /usr/X11R6/lib - dosym /usr/lib/libXft.so.2.0 /usr/X11R6/lib/libXft.so + dosym ../../lib/libXft.so.2.0 /usr/X11R6/lib/libXft.so } pkg_preinst() { - mv /usr/X11R6/include/X11/Xft /root/.Xft + if [ "${ROOT}" = "/" -a ! -d /root/.Xft ] + then + mv -f /usr/X11R6/include/X11/Xft /root/.Xft + fi } pkg_postinst() { |