diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-04-19 06:16:54 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-04-19 06:16:54 +0000 |
| commit | f6cb713fb0fb30cdad4b1f20ab56540624b41672 (patch) | |
| tree | d644987cdafce6a9fd5e538da5cbb23b182c9eaa /x11-base/xfree | |
| parent | don't rdepend on sed (Manifest recommit) (diff) | |
| download | gentoo-2-f6cb713fb0fb30cdad4b1f20ab56540624b41672.tar.gz gentoo-2-f6cb713fb0fb30cdad4b1f20ab56540624b41672.tar.bz2 gentoo-2-f6cb713fb0fb30cdad4b1f20ab56540624b41672.zip | |
Don't remove fonts.* or encodings.dir in dirs not provided by this package (#30698).
Diffstat (limited to 'x11-base/xfree')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r5.ebuild | 13 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r6.ebuild | 13 |
3 files changed, 22 insertions, 11 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index a1aa1acbed5f..e05f71e44f14 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,11 @@ # 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.324 2004/04/19 04:58:51 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.325 2004/04/19 06:14:07 spyderous Exp $ + + 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild, + xfree-4.3.0-r6.ebuild: + Don't remove fonts.* or encodings.dir in dirs not provided by this package + (#30698). 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: Add more backwards compatibility things -- symlinks for all former font, doc diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild index dc749912961d..fbdc3b2f052c 100644 --- a/x11-base/xfree/xfree-4.3.0-r5.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r5.ebuild @@ -1,6 +1,6 @@ # 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-r5.ebuild,v 1.10 2004/04/19 03:05:56 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.11 2004/04/19 06:14:07 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 ... @@ -994,10 +994,13 @@ pkg_preinst() { # 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 {} \; + for G_FONTDIR in ${G_FONTDIRS} + do + find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ + -exec rm -f {} \; + find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \ + -exec rm -f {} \; + done # make sure we do not have any stale files lying round # that could break things. diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild index c230e05fb0f5..8c8ee73620e4 100644 --- a/x11-base/xfree/xfree-4.3.0-r6.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild @@ -1,6 +1,6 @@ # 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-r6.ebuild,v 1.23 2004/04/19 04:58:51 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.24 2004/04/19 06:14:07 spyderous Exp $ # TODO # 14 Mar. 2004 <spyderous@gentoo.org> @@ -1067,10 +1067,13 @@ pkg_preinst() { # clean out old fonts.* and encodings.dir files, as we # will regenerate them - find ${ROOT}/usr/share/fonts/ -type f -name 'fonts.*' \ - -exec rm -f {} \; - find ${ROOT}/usr/share/fonts/ -type f -name 'encodings.dir' \ - -exec rm -f {} \; + for G_FONTDIR in ${G_FONTDIRS} + do + find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ + -exec rm -f {} \; + find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \ + -exec rm -f {} \; + done # make sure we do not have any stale files lying round # that could break things. |