Rebuild font cache for all ABIs, bug #509938.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 181 insertions, 16 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index f79dbc5b8c96..ee13b46d1f3d 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # 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.192 2014/04/30 17:33:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.193 2014/05/10 21:57:01 mgorny Exp $
+
+*fontconfig-2.11.1-r1 (10 May 2014)
+
+  10 May 2014; Michał Górny <mgorny@gentoo.org> +fontconfig-2.11.1-r1.ebuild:
+  Rebuild font cache for all ABIs, bug #509938.
 
   30 Apr 2014; Michał Górny <mgorny@gentoo.org> fontconfig-2.11.1.ebuild:
   Use multilib_src_install*() instead of direct multilib_foreach_abi().
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 3e2dbefbb595..6fb53fbd6677 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -25,27 +25,28 @@ DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9
 EBUILD fontconfig-2.10.92.ebuild 4303 SHA256 ed99599373ed5ed92f7475ba43dd8dfe0c10130b0a91d8665ea2fda383717b2c SHA512 a4db178067cc0804a55a435bd907bc7b135af5dd85febd7c29dce70598a751a9654979f75bce044254c05105fb627738173f78666a8a8b6c03b0307d1f4f92f1 WHIRLPOOL c7ca5c2a532dcee0897fe5908a6cbb7d01dabebe3de8bfe906ebcf86dd8f732b6034530f3814c8ae4c0e6ca3051489f57209f4667870e8f38c307d23f5c656dd
 EBUILD fontconfig-2.10.93.ebuild 4709 SHA256 5d6180fef41fe2cfe95218b145942c41f30bd130fb130c56f0829f320db65113 SHA512 3d32cc5127087c1473108b2dc27b6c9aeed4347246a853626fd16c271fc1bddb8e23fdd0ab00b392ffb6d47f49a9762653706d35c29377904c1b278eed85bd79 WHIRLPOOL 8b17b583b7ef1b3df8fe77b01131ef003382e7343bd0a086f674e69f4c02e55f5cfc4b797f33510605e19eb2d3636aef451712f0b264c8534e98330b1a0eb1ab
 EBUILD fontconfig-2.11.0-r1.ebuild 4896 SHA256 324ff1601a367ca83b922361f8a4112d2d43861842ae2df7d8bfd00a50cf8ac7 SHA512 aecc4399c1c8be65480178aec8f058d85625457d3f40c47dc74cecf0303fc863b5b2ab4ec9e45e9351c5b3e5a85679a858433cbfaa74aea2c78d35433075ac42 WHIRLPOOL f2c8cd7b94eb83553a688c4e08831411bd62766833d3fcd311a08fc4d4a3ebfce6c2b3b673ced59b0bdc9ebe75fcc543ba18c4e86567a12053b67a7fede43c02
+EBUILD fontconfig-2.11.1-r1.ebuild 4874 SHA256 477e9eb972f1560e33123c4fd9345d81335d62e37eb67e662ac736ac99a42c66 SHA512 cdd5b16a5b81d7eee7f77f563410459aeb9f469b6f8a4b5516a7bf8cd2a35897474eb3d7a08b47c4483fc42bd1cf06e5c2c1f59ac72a42c4b3cae5abf53155fd WHIRLPOOL 9f9e664b545a72db272b4043e4006790c00af38f623e415c37b5abc079bc57856e0311dcd0bb326b362229f8ca884e2706af3c6e5676634566907784f32eee02
 EBUILD fontconfig-2.11.1.ebuild 4716 SHA256 d997a50b6571e9612d6aabfccdb5e29b3b281a8c26ea02020c55598f5300726c SHA512 67a279236d3bc68580a31e6098e21009909538bd476fe4842f2c6a69be3a68c5d437a852be7c2153abbfcdc992d5c17ac83be7021822fc52ae592a2bd18f006a WHIRLPOOL 50bf0e0917d27427c1205b1abd3d71bea21599ee9007b9702f9e82bfe4d11740d1720093aec05e6d3592c00a07e91ff9d2ea217c6bc783317a59d2013d632050
 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 30809 SHA256 f39911ad4cf7d2a532147382477e4c78118d73426de5f73acf7136c182fed043 SHA512 e3668e49430a3e52e2e35fd2d579149d4bbd8ba4a8dd9865a76ed1c47e467e07797519616e9780ab4faf483d5ec2bb9d678902afdbc59676c415336084d95b41 WHIRLPOOL 85c88907292a270cb0a2ce171fbfa9abd3623affe7dbc2dc72a07d4009d7b445f5e38d3480148a919bee98a785c04102ba1d5f3704c1af48f466e80077ab6698
+MISC ChangeLog 30975 SHA256 0c9a36315e9c09fc721c0c27ddcb8935e0eb07808de8ca25c639cec41ac8c81f SHA512 07732f9c0b81e865142f390472d4c05ce56679f70f0e092d9a17f44a08dbe7acfe982d1b19330d1cacc643fd6f8a1b9a27431cad509552b1681b584e9c7ac83f WHIRLPOOL 270a4076af4a6a9688dac9221496ecb40f47f9801cc54ee2b8ddaaf8fc6ac65197150497ea822b97b9b18f366e8e411bee7e257a1f5b5eca03156e7bd62597a8
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTYTQCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTbqC2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXJ8QAIn8MOVmJhgJKb1O8mOBeBxP
-O81ncFNUFnKYc3AILF/Y2Ug8niWsSSMmxQx2MalHmXIYXONynxTjwXgmaQRgtunu
-Lvu+xJVYHFRn8yaOcnOtT2P25F8RXn5xtUDodk0G4m+mGSICxFLXTFUgh3r/+sf6
-7CXA4Igp2LlQ4wQG1RpVJ0McD/iYnPpErlFPssZa9dLVi9HvzrGKCdOqS9zTuAwm
-MsxA4nREMK34SDqJP/vizM4MhnwBWxvZMcrs069Yqz+/M0QPzVWVhD6KAibccOSH
-UpxeeyKbIbeLZTehBreWWMGgMmpVxRZnXRcZmg7ueyYySqpIWX0o/Ro9INPDnUEw
-qUwdR6YOO3UcgorEQD48bloPIcsGL8EgTyPJevFwqnhegNDEpQwHTYG1UuFb0Zt6
-ozYLU/uh8LpTbq+2+5cbi+5zYaEvEJV6Vl42zz3PhyuN0NghiwCVLkht1qM+rk0q
-s6CI4wMFE9bFH9rvrHZ366jyfrmG/6Ju3jbqtJ/ylU+Ars176iouI3v6bGONxKvC
-8Bs/0ARIu1zrXR44ltw9ORE+ad+RrrDiZ42iYSrqPaieBZ7zZZHl7dsagxYGXMuy
-TZ4xvIJIUEkf3afL32aFdsiwtM5Rn5kPoAL5QLTzFIqtcTXSRE9zIcOJ5DYei5W8
-OpJCKnlnKUYan3ToY+I2
-=ZKw0
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWQMQAN7K605rzexwhR/AEHyh8SD6
+yfwOZOY3gR5Vj8C/LV1P34LDdhZFQ9Ujz0uY0u4HrU4Uv9JEnWh9B/dKsHBiAKaI
+9MbJmH6qqoEGnj1PU2pgt8C1QzSTbX5aR+XSphYGJENzNrl4bWz8M6MMIJyRwhG7
+aKSGPI7it0stprgM0V/EX4cbxBvFc7IhtieF7Z7w8bmzBiYVIdFqkS2aLsj8IjGm
+4PaV30IoWTBNes3uNFykKlj0W7lnn4GIYwZ1pCbxQqi53jcb9wy131swkJMg4UGz
+uyRQ7EBLgafuIHLXJyPb0JnA5fxIZcLuO33urB7xvgB6jjss8mikGut7uL4ltt2K
+c73ey0XDwjGrHJumIibZV9CmJKhalq9mLqCXwNGIARCbDvox/olIUXAz3G2oOyHN
+wLs+v74TLPT84YTaw2mkG4zrEqPUiVfTLIZU+LxuNs0FnK5Ic8PyEC3gr3F4PeO3
+D79DHJtGxLO2ujJe7mDmROe7VoRAQV0xPFoeqjLD0mn3QpiFuYJO5MlRyzvt+KCq
+pSaXHKU/X87PZdfQzddv/U4xiVQ7QxLUGqVYfRt7WOlnKzp2ywsygyqy+VKU40qO
+Zg9tqqwZmUd5f1kAF2W1R0UDZ/lBRyy4L2Isnj4bPcfx8O2/VGe9NLN/K+BYxY4g
+fdpuxws2cH/HOCoMyaKu
+=2yhn
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.11.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.11.1-r1.ebuild
new file mode 100644
index 000000000000..3d5a4ae87253
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.11.1-r1.ebuild
@@ -0,0 +1,159 @@
+# 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-r1.ebuild,v 1.1 2014/05/10 21:57:01 mgorny 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 ~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-1.95.3[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.2.1[${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
+)
+
+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
+}