Fix fc-cache -r (#531748)

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index e1730a3665313c2658ab03031eb72e32d3f8f2e4..161c20da8937e000745139b1fd1775fbae5c2cdc 100644 (file)
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.196 2014/10/13 07:22:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.197 2014/12/23 16:33:04 pacho Exp $
+
+*fontconfig-2.11.1-r2 (23 Dec 2014)
+
+  23 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/fontconfig-2.11.1-fc-cache-r.patch, +fontconfig-2.11.1-r2.ebuild:
+  Fix fc-cache -r (#531748)
 
   13 Oct 2014; Michał Górny <mgorny@gentoo.org> fontconfig-2.10.92.ebuild,
   fontconfig-2.10.93.ebuild, fontconfig-2.11.0-r1.ebuild,

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 1ce6df0b416d6f3b942fc07da6d4594e5158ef61..1ef291aa2cb3fbb237e833778fb0146d0e31d920 100644 (file)
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -13,6 +13,7 @@ AUX fontconfig-2.10.92-use-glob.patch 3711 SHA256 1a099e418cbea3947a60d933dd8799
 AUX fontconfig-2.11.0-baseconfigdir_fix.patch 576 SHA256 94bdda4f676926e38a81e83c51470dd6c82fb8e7682db8a712c23c9d3960c791 SHA512 086907a2465dc7dab8a054d29821e389bbb340e2af9363b355f68087e2a7d51c53544e98e4f9eb00568b0ea064ac7cf135e3b1dc28fcd1dedbf87b6b9869dca1 WHIRLPOOL b8578c10f763f3d03680753791907b1a55ac89d7fbc810eeccc2d7d0e8fe98cd2a5fdee926700ebd7d4a1602e99ed58d9ed405fda0c3e8d25229e9ccf2495fc0
 AUX fontconfig-2.11.0-solaris.patch 1294 SHA256 b7e283ba13df3723d216134510f1d75a66a1c18430c230fb341117246a8bd151 SHA512 f1fa71cf698a4ba122950a6009c2ba78b75ff697d3d55ab5afa777eeab17e8e1c2f20b1a50423556d405b8eeeb0568299b2bb767cc6b650db815c77b3fed0eb9 WHIRLPOOL 46a92d1b0abe36b1f62c3dc8b21855b6da6f45d22a80e863e6ee16a93ff132b5c75b7b5b3c00dc4d8253fd78e03c97a5757140e2997c33597c118effd7099a74
 AUX fontconfig-2.11.0-solaris10.patch 1867 SHA256 35e8215ea28e39a8b3c26a93fa2398277e4785a31751aa7a0fe574eea4fae1dc SHA512 a7cee3c525a4edd05ed41c11861f967e00352279c32d07a6ba3d1e1b51dcbf3bffe53154ad847e6744b05feb14425dac170cdce8d25481309f094ab31376c372 WHIRLPOOL 19c052c55511f145085bc30af172a75113ba7ac1b599ec8f7ac39e90735ad9918419000945da0fcab3850738ec09a8ac15939563be413a5a58ce36616c1caa8c
+AUX fontconfig-2.11.1-fc-cache-r.patch 854 SHA256 e2ff1b583ff569a3cb9540d6b5ab6ed2c81e8c7ff0c5557646c2e8c94714b963 SHA512 6f9fc84720fab01dc86ec626501114b5e8ab979e87057c40374afd31deeed4b424e5f576734a0214b666a8b1867294da138f25d8b4fcf39e1bd99ca951ff48a4 WHIRLPOOL 0aa128a1b71d170a85506e8ed7e6c18c469d42fa3884f017fa6bb1fae424bec582f8efc1c7fdccc2fd9abaa7961e9c5ebb69bf90fe08833075e96f00d9682283
 AUX fontconfig-2.3.2-docbook.patch 506 SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 SHA512 8c5bc39c6d5c3b0457c626c678c0a7c94c5e5a4f041b5b2a42df04701750961e24950135d2e6df4d4e1c64a7f28e50a2533ab154d7226cf0a63db0853149f64f WHIRLPOOL 84de35d8f5755a10eb170b2f54afc5b89f4c1757b10f053adc9b5e96aebcd5bbfc47d16963f01a2b3bc0f791a736439b3317f823221794f9fc93e5c57162734f
 AUX fontconfig-2.7.1-latin-reorder.patch 1701 SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82 SHA512 8fc514649e40ecd0c52e4fef9479e0945baa3aaa396335650bf827a983f6d9187b0f66ab97bf5b11b14917518b2e955b0a1bca126a336feafbebf754ff646d5d WHIRLPOOL e6e90c38c7ce04e297c48f5b9859c5e9230a59e9722dacde5ddd434cca8fbd33fab55f704df540eea3f3efd6ee05884987e6ce5da544d2b41f869e47ce3d259d
 AUX fontconfig-2.8.0-urw-aliases.patch 509 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4 SHA512 774c57a28e10eb666c18e69dd7cf59fe1110fe13bbbade185dbd21be4917d4d7fb632be56805b2739ea9b47ee96560c8dd1d3d1916fed56ac32a16757a911f7e WHIRLPOOL 11d7056d1830a7e48aea00a22bb81397c9025f59817fd476dc26083e7ac2603aefd2ace261dfd04df78b6caa8d9c07f66027f37438b4677a7efe28b3cff260b6
@@ -26,27 +27,16 @@ EBUILD fontconfig-2.10.92.ebuild 4314 SHA256 c818ba919896a05fb47a64792ccad821c05
 EBUILD fontconfig-2.10.93.ebuild 4721 SHA256 b9b9372bee2da410b3ea7a888a7e2450a5c9f55f547fc9e20c51c5000a88e9b3 SHA512 e1f5d69216a5e9469d5c5f0ccd435991ce381e627244c0a49039ef88d77ff1ee176d9b1c907999f8cb75f3d8ace7688756defb5c08251fcf0e828f0860a3c91f WHIRLPOOL 5d3f031c55aa2eb854ca0cb37f271a29b432eea2570c45ab3cb62fd72bff5de3690cf2a6b46854fce3a5eeac5578c9a14cfb409e5148cb1ee87586289d2d71b4
 EBUILD fontconfig-2.11.0-r1.ebuild 4902 SHA256 f008bdfef0636b1fa8141e4bcdeb2ae5344041bfc2a6d5b155de474e33da50c7 SHA512 97fee695183d59e7bcd7208d2fa1044aa1996e38938cf79723f12c49b256426111f5eeceac45087bf66c50f1232fe502bfbd65970abbfe571415b27350964d1b WHIRLPOOL ca343f3d103a40016e1608bf0e9c0a3a14a7ace064ec7f1c1e3ac471cb6367241729dadf099043ba5fd8f8edd69270055b32cb8e275d9dcdafdf6207e5ce901c
 EBUILD fontconfig-2.11.1-r1.ebuild 4886 SHA256 3e9f72372c4f38a401c5348cc72257f2e85642c91354f4fdf7199c0a24384756 SHA512 1155627a61b2e8469b284fb59770abb142b7d76f6b9dc30e160c525324f542489fcc0f34808cf9c75b612183df121892070ad969f62e1c725c7c7675b3f8391f WHIRLPOOL 41fd4da60058be6653ab619d9bcacdf9d5092c9825094867ab046e83289454e841a1cd1179c290980cce8f7592508c9457b95877e8f216ffb20fbd81c3df656a
+EBUILD fontconfig-2.11.1-r2.ebuild 4939 SHA256 3ccac91115c95a57f7afb1b558e938e11808e8380ba8d6a22e566a18d2e4ff78 SHA512 abd3099b432713220815f8548eb2e1b8a6a8e7591afe9c9dad1c0d7d22a7b9cc01744c8301ee7d39ea930a2f63ec13da84cb7c8c0e7e943eaff77a6dfab801f0 WHIRLPOOL e1d6082bad64d5961dcc9cf224b9cde5dd6ebb4460701f4e795c4efb9f2d16ce8a3c9cbd74d219275852a7b0565f589400a8ba1b38053fd78638e6a2b15dfd5a
 EBUILD fontconfig-2.11.1.ebuild 4728 SHA256 bc7a72daa683e8516339caabd70ba925a32ca982b44e957962361bd28b42fb26 SHA512 7bc8c496e8f02f2c1b579c80d79286b6f8cccd3a6e054848d2d8db6166cbd63b519d074378596b5f28db6fbe477e6037492bbf8d5714f64a62bc38e5b06f9d05 WHIRLPOOL dec146a68d6213c443c834ea3642d497b0e511cbfc5b2705c61ed3e478e117a9be793612abdd456d26ca7234f687e510091e988dd0c05c2179bb9aa3fd024943
 EBUILD fontconfig-2.8.0-r1.ebuild 3979 SHA256 41cc191c9e0763037801dcc0c8d8c753ce3ec5f236cec906a2e21a6140e5306f SHA512 5f0e19e48f9a7ca5ea863f2dd6c1afdcc2de2433a06da0ce69e5b6fcb769c757ebf2dcfaa500fc6532862af100501d5162678a1f7ce11256a871520350956556 WHIRLPOOL 7aca6d65eba1a31ab29ade2dbe39f6fc85d6542bed47aaadd3bfa38f5708aacf60b357a8f2df61b16da7e654e91a16b345cf17997de775099bad91680d305c92
 EBUILD fontconfig-2.9.0.ebuild 4081 SHA256 6c897b70cec26bf69f8fd6344e62fa5204b4cd46860c1e5ea7cfa961c8b22b14 SHA512 7495d2a674d407d3ba535288b444034a3a7a9465eab1b89807e4f59366f0a8b548d0db973858026e58c4e633e0652ad7ffe9c0f5ba8037e207ede9082e84694b WHIRLPOOL 0d9a1b4d4dbd2c4e6fb790d5dea3e369ec112468843af9ce0c7a5f0dce0af1f411544b13dfeb4dceb4cfe9c1d5507dd304349ba33fc57a8a761ed47bc834ad18
-MISC ChangeLog 31552 SHA256 bf1d93beb98af03f6b62f71a54eecdf92000ffeaf15a926a3b2ec905f62fc240 SHA512 2f0ecc8b81fdc3f6e69ff57a32eaaf6247b28dc9aa4a15b64437d8729389a6985c50345fa2c4dd31c7e56a636de75c832ea08736168331b5ea10696fd2dcbae4 WHIRLPOOL 22c94cce5e0e587f7c5e3bc0f741dce0ec41b98f401e840783ab44d4d26a035635cf1d89528a6c9fe39461cf611eefaeb4d57b9500231cfe38a44d505ad3c7fb
+MISC ChangeLog 31738 SHA256 6b43b9463bd1831715e6e16e189c2925c2a3409e63072bed2ceddb173faf02be SHA512 8dad5eb58f0b6ba8e5a53bcecfe8a75b4e122c6785efba21a5224903bdcc3bb6e90e05689f68398202d6e4da1a69ab0667ff6985fc3116dfaf0426c5b1260763 WHIRLPOOL 0f1a8b49fe4eea71a8f2cb46a7301b1f2f160dff443160f8e5c2d621e6775e2c52923e78ca4d52341ef26c21c4bbd02bb682dabc659c639ea57e1ea81ba85f61
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUO32zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/D8P/2cfWGGlX5XLiQglXgHQQZXD
-Xb4UH/jG0+qcIYdllBMRxBdJSSQOc/IHxMqULm8aqtOBHDRpY6NTPy6YOOa6vImB
-Ypa4Tb9wb388FvppcLwgDQkz1BmT1UdD0F7r0nCP6ptvZlp7JkwAxmewJLY/86md
-2hVZ+BgIiagNnkdzjhFl4NitJ4S7LQUf2egIMJAIPqyT0qDHyOKw5JWASVB5GTg9
-mHAf9Zdr9iOgSyfErEDpDE1ERfwGA217Yboow8P237jWiPoLVCJH9TomCcjGbqyU
-jNY3Wn6L0fhle1r3bYVh9kWhSisTmxlEn33BYp1HQjwJW59qJ/6h0UTYO2G7KOcf
-EAFKLmU/6iAdXkpfVZehnU6985jgE/8I02ByRNyGoNFGKr9PBntuz2zb6SZ//+3J
-ebbwh2N41lT4QoR0kfsHqXUFV4fm42W8CQzmMoed5pdrumo3eV9U0JcClgdy8y3+
-ulnfSHcsTH7orWzJOQ9V5AbweccGfZtrBCabCbI2uUg12kO8VV7k0x0hGhjK1kJF
-9owfyvntW7ERG347Vy3+ood7hRkPuPkNwaFbOdFSoztPpWtMxRoRmTlEIr3VoEEK
-9bkvWfoyiV12r8umy/gumYEfdbm0oR79D9Hgg3PtkqnE5xQnxNQNLgzKmyREZ4QS
-a0ydaN0Kf37pjcbaxW5I
-=G9yk
+iEYEAREIAAYFAlSZmUEACgkQCaWpQKGI+9TaiQCfWBZjHGbuUlJsUXwoR7bmddUG
+FMgAn0t39Z9N+7Qb4P7PpFHJozUHg2A+
+=h6EZ
 -----END PGP SIGNATURE-----

diff --git a/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch b/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch
new file mode 100644 (file)
index 0000000..48f67f1
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch
@@ -0,0 +1,26 @@
+From f44157c809d280e2a0ce87fb078fc4b278d24a67 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Thu, 10 Apr 2014 19:27:55 +0900
+Subject: Fix fc-cache fail with -r
+
+Do not unlink the cache even if --really-force is given.
+because re-scanning process expects the cache exists.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77252
+
+diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
+index 99e0e9f..90ebad3 100644
+--- a/fc-cache/fc-cache.c
++++ b/fc-cache/fc-cache.c
+@@ -388,7 +388,7 @@ main (int argc, char **argv)
+     list = FcStrListCreate (updateDirs);
+     if (list)
+     {
+-      ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
++      ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL);
+       FcStrListDone (list);
+     }
+     FcStrSetDestroy (updateDirs);
+-- 
+cgit v0.10.2
+

diff --git a/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
new file mode 100644 (file)
index 0000000..13f2a42
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild,v 1.1 2014/12/23 16:33:04 pacho Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=yes
+
+inherit eutils readme.gentoo autotools-multilib
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc static-libs"
+
+# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
+# default and used by every distro.  See bug #283191.
+
+RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+       >=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
+       abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       doc? (
+               =app-text/docbook-sgml-dtd-3.1*
+               app-text/docbook-sgml-utils[jadetex]
+       )"
+PDEPEND="!x86-winnt? ( app-admin/eselect-fontconfig )
+       virtual/ttf-fonts"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch   # 130466
+       "${FILESDIR}"/${PN}-2.10.2-docbook.patch        # 310157
+       "${FILESDIR}"/${PN}-2.11.1-fc-cache-r.patch     # 531748
+)
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/fc-cache
+)
+
+pkg_setup() {
+       DOC_CONTENTS="Please make fontconfig configuration changes using
+       \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+       overwritten. If you need to reset your configuration to upstream defaults,
+       delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+}
+
+src_configure() {
+       local addfonts
+       # harvest some font locations, such that users can benefit from the
+       # host OS's installed fonts
+       case ${CHOST} in
+               *-darwin*)
+                       addfonts=",/Library/Fonts,/System/Library/Fonts"
+               ;;
+               *-solaris*)
+                       [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+                               addfonts=",/usr/X/lib/X11/fonts/TrueType"
+                       [[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
+                               addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
+               ;;
+               *-linux-gnu)
+                       use prefix && [[ -d /usr/share/fonts ]] && \
+                               addfonts=",/usr/share/fonts"
+               ;;
+       esac
+
+       local myeconfargs=(
+               $(use_enable doc docbook)
+               # always enable docs to install manpages
+               --enable-docs
+               --localstatedir="${EPREFIX}"/var
+               --with-default-fonts="${EPREFIX}"/usr/share/fonts
+               --with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}" \
+               --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
+       )
+
+       autotools-multilib_src_configure
+}
+
+multilib_src_install() {
+       default
+
+       # XXX: avoid calling this multiple times, bug #459210
+       if multilib_is_native_abi; then
+               # stuff installed from build-dir
+               emake -C doc DESTDIR="${D}" install-man
+
+               insinto /etc/fonts
+               doins fonts.conf
+       fi
+}
+
+multilib_src_install_all() {
+       einstalldocs
+       prune_libtool_files --all
+
+       #fc-lang directory contains language coverage datafiles
+       #which are needed to test the coverage of fonts.
+       insinto /usr/share/fc-lang
+       doins fc-lang/*.orth
+
+       dodoc doc/fontconfig-user.{txt,pdf}
+
+       if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
+               mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
+               rm -rf "${ED}"usr/share/doc/fontconfig
+       fi
+
+       # Changes should be made to /etc/fonts/local.conf, and as we had
+       # too much problems with broken fonts.conf we force update it ...
+       echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+       doenvd "${T}"/37fontconfig
+
+       # As of fontconfig 2.7, everything sticks their noses in here.
+       dodir /etc/sandbox.d
+       echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
+
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       # Bug #193476
+       # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+       # config files.  If we install as-is, we'll blow away user settings.
+       ebegin "Syncing fontconfig configuration to system"
+       if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
+               for file in "${EROOT}"/etc/fonts/conf.avail/*; do
+                       f=${file##*/}
+                       if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
+                               [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+                                       && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
+                       else
+                               [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+                                       && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
+                       fi
+               done
+       fi
+       eend $?
+}
+
+pkg_postinst() {
+       einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
+       find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
+
+       readme.gentoo_print_elog
+
+       if [[ ${ROOT} = / ]]; then
+               multilib_pkg_postinst() {
+                       ebegin "Creating global font cache for ${ABI}"
+                       "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+                       eend $?
+               }
+
+               multilib_parallel_foreach_abi multilib_pkg_postinst
+       fi
+}