summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-08-02 01:27:20 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-08-02 01:27:20 +0000
commit94f4c38040c494a059cf3b374bc2eab45beb8e31 (patch)
tree6d6d6f932fce0738233ef34da8064fd687549e99 /x11-base
parentMark x11-plugins/wmwave-0.4 stable for x86. (Manifest recommit) (diff)
downloadgentoo-2-94f4c38040c494a059cf3b374bc2eab45beb8e31.tar.gz
gentoo-2-94f4c38040c494a059cf3b374bc2eab45beb8e31.tar.bz2
gentoo-2-94f4c38040c494a059cf3b374bc2eab45beb8e31.zip
When fixing #30698, forgot to set G_FONTDIRS, so nothing was deleted, even the things that should have been.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog7
-rw-r--r--x11-base/xfree/xfree-4.3.0-r5.ebuild4
-rw-r--r--x11-base/xfree/xfree-4.3.0-r6.ebuild4
3 files changed, 12 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 375b22a5764a..0ba43c57332c 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.354 2004/07/26 20:13:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.355 2004/08/02 01:27:20 spyderous Exp $
+
+ 01 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild,
+ xfree-4.3.0-r6.ebuild:
+ When fixing #30698, forgot to set G_FONTDIRS, so nothing was deleted, even the
+ things that should have been.
26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild,
xfree-4.3.0-r6.ebuild, xfree-4.3.0-r7.ebuild:
diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild
index 5478be6153a1..6f93d1fb3fb6 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 Foundation
# 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.19 2004/07/26 20:13:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.20 2004/08/02 01:27:20 spyderous Exp $
inherit eutils flag-o-matic gcc xfree
@@ -992,6 +992,8 @@ pkg_preinst() {
# clean out old fonts.* and encodings.dir files, as we
# will regenerate them
+ local G_FONTDIR
+ local G_FONTDIRS="100dpi 75dpi Speedo TTF Type1 encodings local misc util"
for G_FONTDIR in ${G_FONTDIRS}
do
find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index 3a13549fe7bf..73996c0cabbe 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 Foundation
# 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.50 2004/07/26 20:13:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.51 2004/08/02 01:27:20 spyderous Exp $
inherit eutils flag-o-matic gcc xfree
@@ -995,6 +995,8 @@ pkg_preinst() {
# clean out old fonts.* and encodings.dir files, as we
# will regenerate them
+ local G_FONTDIR
+ local G_FONTDIRS="100dpi 75dpi Speedo TTF Type1 encodings local misc util"
for G_FONTDIR in ${G_FONTDIRS}
do
find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'fonts.*' \