diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2007-09-02 15:02:47 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2007-09-02 15:02:47 +0000 |
| commit | 1b67f24fabb4cbdc3da900a58f226561b795f756 (patch) | |
| tree | 79ff411e8772fbc8f104a908196b2680927b786a | |
| parent | Stable on ppc64; bug #170861 (diff) | |
| download | gentoo-2-1b67f24fabb4cbdc3da900a58f226561b795f756.tar.gz gentoo-2-1b67f24fabb4cbdc3da900a58f226561b795f756.tar.bz2 gentoo-2-1b67f24fabb4cbdc3da900a58f226561b795f756.zip | |
Use CONFIG_PROTECT_MASK to force updates to /etc/fonts/fonts.conf rather
than nasty pkg_postinst hacks. Bug #183576 by Alan Hourihane.
(Portage version: 2.1.3.7)
| -rw-r--r-- | media-libs/fontconfig/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.4.2.ebuild | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index 0fa9643abea0..279b3427f21d 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/fontconfig # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.97 2007/07/21 03:24:15 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.98 2007/09/02 15:02:47 dirtyepic Exp $ + + 02 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> fontconfig-2.4.2.ebuild: + Use CONFIG_PROTECT_MASK to force updates to /etc/fonts/fonts.conf rather + than nasty pkg_postinst hacks. Bug #183576 by Alan Hourihane. 21 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> -files/fontconfig-2.3.2-pkg_config.patch, diff --git a/media-libs/fontconfig/fontconfig-2.4.2.ebuild b/media-libs/fontconfig/fontconfig-2.4.2.ebuild index a27ff8247c59..4414e324762c 100644 --- a/media-libs/fontconfig/fontconfig-2.4.2.ebuild +++ b/media-libs/fontconfig/fontconfig-2.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.4.2.ebuild,v 1.13 2007/07/12 05:11:22 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.4.2.ebuild,v 1.14 2007/09/02 15:02:47 dirtyepic Exp $ inherit eutils libtool autotools @@ -55,7 +55,6 @@ src_install() { insinto /etc/fonts doins "${S}"/fonts.conf - newins "${S}"/fonts.conf fonts.conf.new cd "${S}" newman doc/fonts-conf.5 fonts-conf.5 @@ -71,21 +70,24 @@ src_install() { fi dodoc AUTHORS ChangeLog NEWS README -} -pkg_postinst() { # Changes should be made to /etc/fonts/local.conf, and as we had # too much problems with broken fonts.conf, we force update it ... # <azarah@gentoo.org> (11 Dec 2002) + echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig + doenvd "${T}"/37fontconfig +} + +pkg_postinst() { + echo ewarn "Please make fontconfig configuration changes in /etc/fonts/conf.d/" ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!" - mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf - rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf + echo if [ "${ROOT}" = "/" ] then ebegin "Creating global font cache..." - /usr/bin/fc-cache -s + /usr/bin/fc-cache -sr eend $? fi } |