gentoo resync : 21.12.2017

2 files changed, 163 insertions, 0 deletions

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7b4a80931cf3..7b10e69413c6 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,7 +6,9 @@ AUX fontconfig-2.7.1-latin-reorder.patch 1701 BLAKE2B 9ac50adca6b257ebd12848ac09
 DIST fontconfig-2.11.1.tar.bz2 1516095 BLAKE2B 4f78c606d198c4d721dd7fe61181f4433a562fee7f69372e64b661e4aac7750928bc158691fdbaf5ae932bda373d007f95a6d0089cda2eb50f15f599c4eb9d6f SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
 DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
+DIST fontconfig-2.12.91.tar.bz2 1678752 BLAKE2B bb34ec8559a372696e72629aaac517c24ee5a9503ba6f8c20fdda22f5e2eac49b94323c18e6d90cbcba72fd00b0ad8a88c12c9954b55c90f78e7888129773abc SHA512 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301
 EBUILD fontconfig-2.11.1-r2.ebuild 4782 BLAKE2B 4bcd94fed5731033e8723f723b60bb459d126352e3c08dfcfde9b115e3f97dc6264dbd3b8d388903b3a7b7c6b37ddb397c33db3e54fdfecf2c1c9bcb7d10f663 SHA512 9062067b0c39210ce14f4ad02ca6c603db6d5ec766e2d250fcf617ad3f6f360e684ae148eaf12c0dbbb334d62f021081c9b1b59220a4f3afd77f0b84a3a13f33
 EBUILD fontconfig-2.12.4.ebuild 4942 BLAKE2B 4a9a8de85fccc6334116363078fd2638af1a9d989afe77930b51d1c8345541c1fd1d40411dd46a1d1b2db962cc1e4c5212f9c39b12d19ee8091c57ebdfaaf6e4 SHA512 ad239f720f3e2d7b41dd2bfd4a59e4a9fac956729caf96877d00e4a451b489c3b553cdab09b7e6555da3fa72760249962bc983c583a6f36620e10fff39ec18b9
 EBUILD fontconfig-2.12.6.ebuild 5020 BLAKE2B 8cf7acfca96c7ed94e598fe4fd41ce574907444de05b1b51dbce5d217acd22b2ccfe2974890aea6b2431f63911638e2a3a1454942437ad50baf17d26542072f3 SHA512 20223c6d58392074ef8658564005fd958b0bb67a6845b63e229290d6b5f9df5a907633c146ad5dd992ef4d0753d3e377209c42e47a9e638d281c3f1e98c58443
+EBUILD fontconfig-2.12.91.ebuild 5021 BLAKE2B 3fe1149281104d8ad95cf2cad63946810aeb10f09cfd38c8b4a7b5a2505f8b8c26c058f4a21c936d759f0e33aaedbaa63b0fe60d4e804ea368676bccc496d0c7 SHA512 b18ed264bf25a44d06ac0d37ec7fc5c78788d90856133018fe8cdad88e2f1a387d552ddfcbc837420826f6baafaf197b9e8b8c97b584aeb0436bed5193daaeca
 MISC metadata.xml 729 BLAKE2B 31b153dd3c6706c13959ad9f2c90a627ea4adc18531c4cf60f9459f040ee915286a303936e53b49cc07e1bfaf800c80f38cbd62105aec88c0329e251a4dd3f47 SHA512 1564dd34d88ce11248bfd5ea6b508eafbc30a4e6ff47f3b9076fbc9f900cf8fe4722a2095512bf7bb659e83fc690d4dbc6b82746a8a38e862577dd09ce7b4a7b
diff --git a/media-libs/fontconfig/fontconfig-2.12.91.ebuild b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
new file mode 100644
index 000000000000..7bbb78c79d99
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal readme.gentoo-r1
+
+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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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-eselect/eselect-fontconfig )
+	virtual/ttf-fonts"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
+	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
+)
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+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_prepare() {
+	default
+	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
+	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
+		configure.ac || die # rest of gperf dependency fix, #631920
+	eautoreconf
+}
+
+multilib_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)
+		$(use_enable static-libs static)
+		--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
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# 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
+	find "${ED}" -name "*.la" -delete || die
+
+	# 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
+}