Version bump (bug #439864), thanks to MeisterP (infinality overlay). Enable docs to install manpages (bug #369991). Apply fix for cross-compile, thanks to Pinky in bug #284762. Use readme.gentoo.eclass for elog message (bug #440518). This version also fixes fonts-conf manpage (bug #349253).

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

4 files changed, 176 insertions, 13 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index f64e0dc31019..5aec09c08279 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/fontconfig
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.161 2012/05/05 08:02:34 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.162 2013/02/08 14:57:19 yngwin Exp $
+
+*fontconfig-2.10.2 (08 Feb 2013)
+
+  08 Feb 2013; Ben de Groot <yngwin@gentoo.org>
+  +files/fontconfig-2.10.2-docbook.patch, +fontconfig-2.10.2.ebuild:
+  Version bump (bug #439864), thanks to MeisterP (infinality overlay). Enable
+  docs to install manpages (bug #369991). Apply fix for cross-compile, thanks to
+  Pinky in bug #284762. Use readme.gentoo.eclass for elog message (bug #440518).
+  This version also fixes fonts-conf manpage (bug #349253).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> fontconfig-2.8.0-r1.ebuild,
   fontconfig-2.8.0-r2.ebuild, fontconfig-2.9.0.ebuild:
@@ -698,4 +707,3 @@
 
   30 Sep 2002; Martin Schlemmer <azarah@gentoo.org> fontconfig-2.0.ebuild :
   Initial version.
-
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index a49f22105ee5..49460e50f83d 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,10 +1,13 @@
-AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5
-AUX fontconfig-2.7.1-latin-reorder.patch 1701 RMD160 ea313617ab751d328e0c4cfb75262ed2acc9a4ef SHA1 e079a3d03c4e2e4dfd36131689694159591ce4bf SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82
-AUX fontconfig-2.8.0-urw-aliases.patch 509 RMD160 b735f3bf416f79e82f2b0944e80972514c313ef6 SHA1 6af46fdd965cee43ec461cb2a4bd5e1fdffc8dd9 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4
-DIST fontconfig-2.8.0.tar.gz 1548409 RMD160 fefee412cad4fa71b573e997e14f1df12f439be2 SHA1 570fb55eb14f2c92a7b470b941e9d35dbfafa716 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
-DIST fontconfig-2.9.0.tar.gz 1682774 RMD160 9456d0ab2ae72086ec3edce9d72e007e2bf9bf1e SHA1 1ab2f437c2261028ae7969892277af2d8d8db489 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
-EBUILD fontconfig-2.8.0-r1.ebuild 3979 RMD160 459e2e6db73ec20b485f74759fd919608548d376 SHA1 904e77598eb6f841eb161d6f17a05aa63c0982e3 SHA256 41cc191c9e0763037801dcc0c8d8c753ce3ec5f236cec906a2e21a6140e5306f
-EBUILD fontconfig-2.8.0-r2.ebuild 4097 RMD160 810e9dc77c20a05006a7870982f3ab82ca544b1b SHA1 612e30166566d7a6dc02e9a84a3b4cad293cd64c SHA256 bef5159f77106a962ab71c9649f09da4edcbf1b97689056bd41d6abb3d0cd72b
-EBUILD fontconfig-2.9.0.ebuild 3995 RMD160 8de30ff9f476b0f385ad19e2ef7827d8f0c25888 SHA1 74fd5bc55dbbb577f895941f05f5ce9dac48924b SHA256 f44ada59e3f6cac42693a7ef30db983a726d07b411d59c5b44e3cb0fe7d17d59
-MISC ChangeLog 25492 RMD160 aebe7a59088c0e781aadcf851b33bf6e78af78ef SHA1 36e24e979680d57bdd06b7a1e417563f7aefded7 SHA256 3679027433c0c6fb287e6a73ec4b9567c572991168f5396512ea8e7311d499dd
-MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
+AUX fontconfig-2.10.2-docbook.patch 648 SHA256 d4b5acc1fe079071cbe7b886769dc561d6318f9193c1e32ed2cca9720a3c346e SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961 WHIRLPOOL b2cfd619aff49024190409c33bd5ff3754b88e5c04a30df52c90bf0ab9b4ce5cd5727423939b70538760bb1e7a02325d76426cf94bdb9e8eb165966b40767197
+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
+DIST fontconfig-2.10.2.tar.bz2 1412488 SHA256 8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952 SHA512 817ce375f987abb6ea01294c22754e194a9b795697e9fe01d454af87010665b22a416d0c857ceac6aab17351cc85fd0915f51d2a8702a00f851e08f65dd840bf WHIRLPOOL a213c2af9ef1e0ccf19ba8c7119cb1d85e06ec048cf66c933fc9c552b7c642b42636714d214dcbd9794024af123189fcbb73dc4968ba2135b66b6191c05d919e
+DIST fontconfig-2.8.0.tar.gz 1548409 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
+DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
+EBUILD fontconfig-2.10.2.ebuild 4116 SHA256 77801af6597d33b51f1570a3100cc4957d416114b185f0cc51a4bb5d3cd15822 SHA512 3dc1acaee17f4945f5648906e41f784df70d8d49e95590138fc38390958b6409e7f21040d8284dbaa6414581e92228afb1bd5dec3d87da437c1563339532cb2b WHIRLPOOL 396ab44ca96329d3cf0d74eda0baaf4fa1a7398105b05160fc8297eafe5727a8ea7e05557e5a69b2b0c37bb17af04c89302f3a6180ff20f29e9a39882228812a
+EBUILD fontconfig-2.8.0-r1.ebuild 3979 SHA256 41cc191c9e0763037801dcc0c8d8c753ce3ec5f236cec906a2e21a6140e5306f SHA512 5f0e19e48f9a7ca5ea863f2dd6c1afdcc2de2433a06da0ce69e5b6fcb769c757ebf2dcfaa500fc6532862af100501d5162678a1f7ce11256a871520350956556 WHIRLPOOL 7aca6d65eba1a31ab29ade2dbe39f6fc85d6542bed47aaadd3bfa38f5708aacf60b357a8f2df61b16da7e654e91a16b345cf17997de775099bad91680d305c92
+EBUILD fontconfig-2.8.0-r2.ebuild 4097 SHA256 bef5159f77106a962ab71c9649f09da4edcbf1b97689056bd41d6abb3d0cd72b SHA512 2870976af6b62fec207efd4836f3870345372716c46c1cf5466f1f697b8f3fea9a1185918240f182eb0ce39d5c85aee8a62e1b29236a8e707fa40c04f08a29f6 WHIRLPOOL ad2f48f5c86d75adca42e936589707b3b2e1a4faff6cc34b26e2ee574e1b73713ff5d57da35927ed8e0545044d98679ef5dbd715c38870f69d3ead0771c0bcd3
+EBUILD fontconfig-2.9.0.ebuild 3995 SHA256 f44ada59e3f6cac42693a7ef30db983a726d07b411d59c5b44e3cb0fe7d17d59 SHA512 e2f7a384abffc76969d2617637cbb3e9fafb1cc28a021dc8c5556c2240841ba196697d23a22e119e8e70119bb7f1614d261b956c168d265de0767706bd8fa649 WHIRLPOOL 6e53c22c05f7e7b0dee5d070654e3597a03ce9cb61e7ca6e87fa7fc918907780dad54ca59a57c2452496fbed217e56060cd0ebb1cf26cb128921b812d5383f38
+MISC ChangeLog 25943 SHA256 35eac6c5ee1bc8179c5679b798751d5fb272b11e669558315d86c9f03afe9c65 SHA512 188f8c20b4df452852a4f672fb66fd3b947a2dd26a41a8d59491f988bff3b9093e62b23619c97ccb43d55b0ecd2083a0a007a3937ac0dd8e13310a7531a2e915 WHIRLPOOL fe930a8797df0ae57065c1c14fadcdc2da381e480ec14b490256eed3ee65c8c6c61d98ea6e0921a9f486d93e650b4e717f26a32e30d4e091e4a210eb479e1102
+MISC metadata.xml 419 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db SHA512 81f3d095bec15c4181c0f6f068de5ab08e1ff48e5bbd715b20572f7f1cd632c355a529d74fceff6d7f0c1c7c4ef44f31be003f12c85b938907cf6624893686eb WHIRLPOOL 1a660ae53987795db3a8e66085f9f35de759862583657184fb4dbb227eefabca77ed8afd12262bef038732539463676e0343437044f3fb6cc0d72c41d5a87729
diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
new file mode 100644
index 000000000000..33d6549c8147
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
@@ -0,0 +1,16 @@
+diff --unified -uNrp fontconfig-2.10.2-orig/configure.ac fontconfig-2.10.2/configure.ac
+--- fontconfig-2.10.2-orig/configure.ac	2012-11-26 09:21:13.000000000 +0100
++++ fontconfig-2.10.2/configure.ac	2013-01-05 15:40:54.541682239 +0100
+@@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
+ # Let people not build/install docs if they don't have docbook
+ #
+ 
+-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++AC_ARG_ENABLE(docbook,           [  --disable-docbook                Don't build documentation],,)
++
++if test x$enable_docbook != xno; then
++	AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++fi
+ 
+ AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
+ 
diff --git a/media-libs/fontconfig/fontconfig-2.10.2.ebuild b/media-libs/fontconfig/fontconfig-2.10.2.ebuild
new file mode 100644
index 000000000000..1bc2a53c8531
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.10.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2.ebuild,v 1.1 2013/02/08 14:57:19 yngwin Exp $
+
+EAPI=5
+inherit autotools eutils libtool toolchain-funcs readme.gentoo
+
+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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+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=">=media-libs/freetype-2.2.1
+	>=dev-libs/expat-1.95.3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-utils[jadetex]
+		=app-text/docbook-sgml-dtd-3.1*
+	)"
+PDEPEND="app-admin/eselect-fontconfig
+	virtual/ttf-fonts"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch	# 130466
+	epatch "${FILESDIR}"/${PN}-2.10.2-docbook.patch			# 310157
+	epatch_user
+	eautoreconf
+
+	# Needed to get a sane .so versioning on fbsd, please dont drop.
+	# If you have to run eautoreconf, you can also leave the elibtoolize
+	# call as it will be a no-op.
+	elibtoolize
+
+	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 ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+}
+
+src_configure() {
+	local myconf
+	if tc-is-cross-compiler; then
+		myconf="--with-arch=${ARCH}"
+		sed -i -e "s:^CFLAGS = @CFLAGS@:CFLAGS =:g" \
+			fc-case/Makefile.in \
+			fc-lang/Makefile.in \
+			fc-glyphname/Makefile.in \
+			fc-arch/Makefile.in
+	fi
+
+	# always enable docs to install manpages
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc docbook) \
+		--enable-docs \
+		--localstatedir=/var \
+		--with-default-fonts=/usr/share/fonts \
+		--with-add-fonts=/usr/local/share/fonts \
+		--with-templatedir=/etc/fonts/conf.avail \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C doc install-man
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	#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
+
+	insinto /etc/fonts
+	doins "${S}"/fonts.conf
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+	dodoc AUTHORS ChangeLog README
+
+	if [[ -e ${D}usr/share/doc/fontconfig/ ]];  then
+		mv "${D}"usr/share/doc/fontconfig/* "${D}"/usr/share/doc/${P}
+		rm -rf "${D}"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"' > "${D}"/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 ${ROOT}/etc/fonts/conf.d ]]; then
+		for file in "${ROOT}"/etc/fonts/conf.avail/*; do
+			f=${file##*/}
+			if [[ -L ${ROOT}/etc/fonts/conf.d/${f} ]]; then
+				[[ -f ${D}etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" "${D}"etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${D}etc/fonts/conf.avail/${f} ]] \
+					&& rm "${D}"etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/"
+	find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete
+
+	readme.gentoo_print_elog
+
+	if [[ ${ROOT} = / ]]; then
+		ebegin "Creating global font cache"
+		/usr/bin/fc-cache -srf
+		eend $?
+	fi
+}