Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xD2E96200

3 files changed, 170 insertions, 15 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 0b00341ebff5..ba9e3e143d49 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.190 2014/01/16 14:43:34 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.191 2014/03/29 20:42:28 vapier Exp $
+
+*fontconfig-2.11.1 (29 Mar 2014)
+
+  29 Mar 2014; Mike Frysinger <vapier@gentoo.org> +fontconfig-2.11.1.ebuild:
+  Version bump.
 
 *fontconfig-2.11.0-r1 (16 Jan 2014)
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 1ca7a5886652..b75b470cf46e 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -19,29 +19,31 @@ AUX fontconfig-2.8.0-urw-aliases.patch 509 SHA256 4a1e122dd3b140765163ca72eba8c2
 DIST fontconfig-2.10.92.tar.bz2 1525585 SHA256 1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22 SHA512 b09996f1715a1d563cfc95a986847d0895fff96fb8a5db4b006a560764654db749675ed5d4ca2369296c0f6d2c21581e63892df2883d021ff6b92ede04788a1b WHIRLPOOL 75164908ce454c26583afde9575e4dac2985dd947f8abaf3a5173777fc738c11430c72674c342ae9445f2a749d0414b7d291032203f62e2cb5d6db5b119f14f5
 DIST fontconfig-2.10.93.tar.bz2 1526089 SHA256 ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c SHA512 5339ac2db160b672a4c9be09f019120c003d90ff6ad7d99894c4ffef7aefb7f3913d886090e4248c33a93481b522561b6057e45243842c8c830e1608e7e5d83f WHIRLPOOL 3f15a0f3e35318a692b895ea50e4a46be70951523853dbc6b2a7e6320bf93de1548d46ac732595d1aa3daaf94a7a4437796ec372021cf9dc7443ba1d885651f5
 DIST fontconfig-2.11.0.tar.bz2 1541382 SHA256 cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467 SHA512 167061981f094060a684809110ac7c3a5bd0e7724427186b499351b25f8f28a3e03fa9aa0ab6db686347673b066fc97f0b27d6e4bfea5f44194244741637c256 WHIRLPOOL 9f905240a8cfa2b1151d6ff9cba7dce4e960e78b072a3a06ac6d49838e8b76a905478d9b6f9fc04aab49c49c2c583da8ea25de3ca12d3e08accda6f58c319e72
+DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149 WHIRLPOOL 45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b
 DIST fontconfig-2.8.0.tar.gz 1548409 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 SHA512 a110e72cc631f1e374324a02f6ba9526b89a547cafe2ae27b9913938b19018843b2940084d62f0dfaf38a6919dea6974fb98422d3908026f6873d5fba17c55a0 WHIRLPOOL cb7c5c461bcb0a0f6ef93d24a10506512beb99233a1f81d904321577c4023e38c7090806c616b8224689400fc4e2209e26aa20aa1f0ad84b2fcad5477061a003
 DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a SHA512 1e91132141756c7455b97fb4d7773b8c0812d98d0c0f5f137c728d6f03cb4601a7f2857c246bd63619d47a8d9aeceb475a16dd625bfc085e235e85b04d29014f WHIRLPOOL a3814b4b2a1b86cedde702545defbcfbca7d3d61ecf512f37a09b5c4041ebb317aadcde1553be534e70d30c212729f547b50cbcd3102226fa92a7c75a7e55620
 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.ebuild 4708 SHA256 f43aa7952787feb1660ad9499132adbe1f182bc9d8c1b5404c79aa0475c72f7d SHA512 216aa4d0e33ede7755657b6dad165f1f1596d0d58df628dba1ce752b5154c66eca7d6e8617d7861ea8b2f12e1ac16940cdced03d6f1f7160dbb5db44af629d76 WHIRLPOOL d9b84da1cdc46459e6f5fc4d6a59a6f2c6f2599537c6f45ae8081f8b61019988cad763e7e81f8ba656d52d89de0fe2c19fa2b593523af44db9dcf72337970de6
 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 30538 SHA256 e9f8cc2f0faef6795383254d95b67abc39241b531aad777c5e3e02496ca025e4 SHA512 65ac2036a7060047170d5d15cff2f919bfa08ab2d3a826d24456737d2a26a44561ca11f84c1481829a8bc961860e8d0981b7fec72ca6ee814f3092498218a309 WHIRLPOOL 7c1d41ba5942ef0c088cbce46c29bf7403255909f2349f46930ef5fa6f05320490f98a63eaefc56aaed705078aba810bde738c32b9da12dd42cf6c4f6c70c687
+MISC ChangeLog 30660 SHA256 9c28f9b3657da3fa850847a340c1054f78de7d3c5841bd6384c97dc9c4ba139d SHA512 78e828eddf83f8e4fb4d5e8132dcffdcdef76f1d31ab7648ce5a46ad30cadce4ea6199041d73c6d4e59406ea131e9461f88d12bdd6138cd4cd195a02fded6b55 WHIRLPOOL 131402139264012867e5bd0d4b7850bc0d1ff7b0eefb580ae1cc1251556e0458974b57021a85e45e5a9af7e4156391ae7a8520341edecaca25da7871198478c6
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1/AXAAoJEPiazRVxLXTFxLgQANhZhRAV5JTw9niUlDY6UsB8
-qCrMGM90+fywFE08AzKtFYgtdvHRBLfD2FvQPI053KX3DOz621p4i8a9SKcK+c0P
-PNRpRJ/3iAD8N+kWoHxiN+jmLoPZUnkLtns7nYm0elMWg9CpA1PLN7mhOc1tpJ3D
-E+GHBQsr7v1OImK1xzV6Qj7Po/iLfWbVb2AkAkmrOc1VYNVgDgT5pRyMOPcnV081
-LIm8vxUoUXcMB0eaAbjzhiQ0R1ZDWhGEtMheD6xHuTGIV3+FLXe25/sEDVEJHPnM
-Au0lIIW9s1R1WIssZaLsiQCWi+DRSGTm/e4jiC9CR7dDR+IsA+ontWYXK0gXuxsi
-5SDSv2QjSX98TrdJ1g7oV5/eXfh2Y+ECTMU7wwOgNJBnRgAab6pPUXBLp3BoXtH4
-2pqov+W1mT4XtDs+iLtnjWEg5alOFWuj1aNFkUMomPXu69fNkdJgULK/Oq7BOwAx
-d/+2vrTEq4nUYd+dmKp/YKmz69vLArg46bqTjF7NGhoIw29WoaB9aW95eZyiQ0TU
-8DR3u9qTUYHkKjiBAu9WlMRCtIrS8qtuvxAlPLqrlrSYR9TVO4o+Eo4ZRe7T0SMS
-IYcZyjc1SQRbJJaNy/x3TRyVVX0fWe2mzJ4KI3JEhvcE9sJaHnq/IAxe7/iKHc0z
-3X2N1xTTH05kG1DC8Z2P
-=C6nF
+iQIcBAEBCAAGBQJTNzA6AAoJEPGu1DbS6WIAa3YQAJLz8cBqC0cD6jMmGw9arE9d
+R+ulvFPsiRSoBKvLW5zpGk89nFzZUcVS/N2+cjUHlFqnAlIpE640YuK7hI9SrZ99
+F1u27p9nLxnWNd2ALZ2QuxqQ9RGRx79fd7O39QT2BNlJbEhyBedZmmZv8M/Y+3By
+sRUxalPTdAXF8xwU/ei1lr1ebX8FKyAm20Jqqtxoz6oFfLWuvby0F+IT8Jd75jZb
+VDR6ucuRY6pxTVXmsGydsG2Uhc28QwpMkJPk7hJq9d6BEmC0iX+f8a9hACtVK9bb
+SfNN0rCBmoGMqEjfGJhJPNhbI6ldO+6FkpJF7REbMOysdC/mj1jffgA875YB5L/c
+Wdc6JKmLxg5v1HevgcVvcRZ145QbMzcNb3lz9cMC+26//3rrZIlqrH4+CvgdPxRB
+kXagIKU4kEnrVPO+9pa93YOhUqegKqUacnIwY8ruFVMjo1DohZ2BrJw+55MtVUph
+rQXDZPvV8KBOYWUu4wfRxOKoyNKsiYQ0+reCd+AJJG70QUZP38sgRNQC3KhVExiL
+lBIDHoyCypFYm78ZUSRB2XbWpuIe4VfM53EvMAfnhDzLdp9q9XBGzuU/Ukny9C1p
+L6h8hpJvP0TsoITJteL8RcwNTMe9VShQYEtryfYe91VJVPMkclDu+EVvLIfE00wR
+aWePzbbw5k0JEsGo5Mv8
+=pxhE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.11.1.ebuild b/media-libs/fontconfig/fontconfig-2.11.1.ebuild
new file mode 100644
index 000000000000..da70c79c38cd
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.11.1.ebuild
@@ -0,0 +1,148 @@
+# 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.ebuild,v 1.1 2014/03/29 20:42:28 vapier Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-multilib 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 ~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
+)
+
+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
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	# XXX: avoid calling this multiple times, bug #459210
+	install_others() {
+		# stuff installed from build-dir
+		autotools-utils_src_compile \
+			DESTDIR="${D}" -C doc install-man
+
+		insinto /etc/fonts
+		doins "${BUILD_DIR}"/fonts.conf
+	}
+	multilib_foreach_abi install_others
+
+	#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}
+		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
+		ebegin "Creating global font cache"
+		"${EPREFIX}"/usr/bin/fc-cache -srf
+		eend $?
+	fi
+}