[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Ryan Hill (dirtyepic)]

dirtyepic    09/10/31 23:08:25

  Modified:             x-modular.eclass
  Log:
  Existence of fonts.alias files prevented removal of otherwise empty font directories.  Bug #249190 by Martin Väth.

Revision  Changes    Path
1.116                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.115&r2=1.116

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- x-modular.eclass	27 Oct 2009 15:16:17 -0000	1.115
+++ x-modular.eclass	31 Oct 2009 23:08:25 -0000	1.116
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.115 2009/10/27 15:16:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.116 2009/10/31 23:08:25 dirtyepic Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -516,7 +516,7 @@
 # @DESCRIPTION:
 # Get rid of font directories that only contain generated files
 cleanup_fonts() {
-	local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
+	local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
 	for DIR in ${FONT_DIR}; do
 		unset KEEP_FONTDIR
 		REAL_DIR=${ROOT}usr/share/fonts/${DIR}