Version bump. Drop old ebuilds.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B2474AD43CE296E!

6 files changed, 33 insertions, 424 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 739e039ce069..0b5e15d013ea 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.175 2013/08/21 08:19:48 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.176 2013/08/21 08:42:47 yngwin Exp $
+
+*fontconfig-2.10.93 (21 Aug 2013)
+
+  21 Aug 2013; Ben de Groot <yngwin@gentoo.org> +fontconfig-2.10.93.ebuild,
+  -fontconfig-2.10.2-r1.ebuild, -fontconfig-2.10.2.ebuild,
+  -fontconfig-2.10.91.ebuild, -fontconfig-2.8.0-r2.ebuild:
+  Version bump. Drop old ebuilds.
 
   21 Aug 2013; Ben de Groot <yngwin@gentoo.org> fontconfig-2.10.92.ebuild:
   Order dependencies alphabetically and tighten up formatting
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index ba74f558fdb8..f2e970bed870 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -13,36 +13,32 @@ AUX fontconfig-2.10.92-use-glob.patch 3711 SHA256 1a099e418cbea3947a60d933dd8799
 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.10.91.tar.bz2 1507887 SHA256 a4727954e950c0b8ae71580e2328bf54457d835ff3023ae4bd7221f9073e63ee SHA512 a239b33c4404db2db769cd294e672a7c8577266252eb2828f1838e1a2952a6fbb1646d7946ac5f299e9399b0428c8333ab0bf984b855188ee2c244f16a844b6d WHIRLPOOL 1db43a01c772aaedf1d0402a38fa51035c7b269bb419bde864a219869d231b11a0b1f0e44d62c5153927b047949b2c91f08622d2ca03466b9a76226e23e3d63a
 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.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.2-r1.ebuild 4145 SHA256 01957e8cda65b591a97fcd7b1e651d2e87013cdef2ac51a3cc8ca011011361bd SHA512 b208385ddd9ecc7361173ea10f494fb196adb655a03311bc37554c6d4b7889e9bd4aa0847adca888b70e3b0f95cefc91bfbd4fd1f4d07d12406e7a1c62193b17 WHIRLPOOL 25f682acffde4e6d122be35f5daf8434aebe49e6933e09500b5b44b5ab93d9cd334eb0704f63004e462d53b60b2a42749828a1d57763393eafa9a5b959217500
-EBUILD fontconfig-2.10.2.ebuild 3943 SHA256 6528a0c5be7f4a0abb590f7a15e8d97df5093f677de641804638ad0c180a5413 SHA512 e7b119d8bda01bd6ecbc01e43baeaf486ad86298c26f263fbd77ffab75a5f710474b4b81392ea8934fc83d67726c02fe0f88934b76877b61566b35ed65c6b57f WHIRLPOOL 0810614452832ed22abb2168b89b3c93b1eacc4d4b9ece4fde26be2442e586be483688282f0064a91b683d873486135afb9f9f5c93083f636f541ef0a75014fd
-EBUILD fontconfig-2.10.91.ebuild 4143 SHA256 7644198418b5d1f4c206fd61aeefe4ae2b3a3dca0d907dff42f7b7a31bf6c055 SHA512 8862bd3258875b8a73e5a56786511c2007418b5a9433127718a97e57bbd7079266ff8e36f241fc77c5c2acb8c80149372cf2c5b40dbd0bac93ba1e2a57de4201 WHIRLPOOL bfc1bc991428701925c5c9043641f9a8d845ee46e8abb3733bafaa77149d370cbc1e43beb6d073d55e2330feeb0135ad48615195143c919045b041339716d4a5
 EBUILD fontconfig-2.10.92.ebuild 4314 SHA256 cb676ca71cad41b29a10c481b853b672cc7034a0a688c93d21156c7cb00a2b4e SHA512 25f4717d396a0189a8c69bcee06298094c2c8660b6e208d2973388f85ac425ad28c3500ff679c6a3ac710f2ee232ec7001e123cb4ea95130f74eb8d93967301f WHIRLPOOL 21a9864dda91b4260c055704ab05a9a7651a1171596fc0392322508712ecad784a132b3dc3c0440fdaf600f3df60902e2bb132726e6617014d13710b294bcb9f
+EBUILD fontconfig-2.10.93.ebuild 3999 SHA256 e4b0597ebc3a574a753d09fa18bc16622b784215e7ab4c3a2477d97843077e18 SHA512 0915e8e2995c18745e7220fd69e04319769e0ace57d9143e052cf9a040058f8f96b636879bc874302cb536d71dd6fde271484014635a3dda1b7e1162f572388c WHIRLPOOL 7bc0a783d40f89b8c3602db389fb4594f2bdfce89ee14353c250b4093cf09098685e908235350fa1e584782622ce3c26cd315f42f3f606805eae8e67cf6ecb16
 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 4081 SHA256 6c897b70cec26bf69f8fd6344e62fa5204b4cd46860c1e5ea7cfa961c8b22b14 SHA512 7495d2a674d407d3ba535288b444034a3a7a9465eab1b89807e4f59366f0a8b548d0db973858026e58c4e633e0652ad7ffe9c0f5ba8037e207ede9082e84694b WHIRLPOOL 0d9a1b4d4dbd2c4e6fb790d5dea3e369ec112468843af9ce0c7a5f0dce0af1f411544b13dfeb4dceb4cfe9c1d5507dd304349ba33fc57a8a761ed47bc834ad18
-MISC ChangeLog 28286 SHA256 3bc5d26acc3aec415d2d5f0ac508dfc976e7975e71531cfc164502e1357fd877 SHA512 d382a645de00b9ffbfdd699df71be15fce5a7b22205cd54e0b35b5d91674bd6c1f39a3da620082c7770d50f265bae6cda6ae22732487fd56791c6df6197701de WHIRLPOOL 38e66253feb4a02d27d16f67f694380355b6065b15849a02491a027a5529f5bece5871acd9e1ab6aa4c70a0d60ac52fdc5390885a14969d8915c3023b07556d0
+MISC ChangeLog 28550 SHA256 51b57673c9606973b1a7c199f7b8d0276b8b45de3946e7df9c9606f1a9f7b730 SHA512 14e57fd0f7eda156ffdc13c9f59c49a768370037f9b69aa1fc571738f54e4576a1d14a3fbe2f17ee4b1a5f94ebfbab032bf54a09030434c604840f0b1878e300 WHIRLPOOL 1568681518d42080c3112fe59489e598db1f690d326481a99c806b07401ae1bba7be4cf19c8c3599a12b0cb82d54185b15124e7b61bfb2ed58e3e97d9d433e3d
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSFHgmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSFH2GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluricP/i1CiRrQRTQEL51robeOjQzG
-QmCfjZUi/4/cpWI/oOVcU2ZKQ/YXktZDWcXtI2B6L/ydNZfxAcf9l6wwzj6qSm4L
-itbUBKSQ8CZHhg5DS0lw4QBT+q4tzBbhBJpm/c22H+6fM00egKk8ZU2mTFKIWYrd
-Tw5m8zbKY73lv40wClvkCQ7spPkI5fbf49s6Llw61I7jenYskK4hU2EMvoz9pbdj
-fiz+JmDucvWAdgt57bcJN46XzCjCYJXu3KoLDkm2tb9hnbBX9CJ9txKyZm1/BjB5
-U1PfEuD5ABoCm4yHie34zjl1JMWSOP/Htr60zJkTewN9Gi3g0yRSxY+ZiLI1n/8t
-In31f/LFCvbcQBq6Zt2Z3vfIMhlyfMft9f5K5dQYBE6ABxCZ62UMBNQcpLsgHoP7
-wM51HaR2MBQbj4O6pHcgJjpBesgwMJpLVriCY8rfQJ2umOs7jvM9muF7xwnXi5oI
-H0vajB/9pMSw/1abwn0WLBQO38vNXRbPXVxZRNde6cM4Wky9JyxTx++C22V7AtTz
-FrHa2XqT4NIAVYMnxVmyMRY9mwwOuc9oCzU8S3ZGtrvfRHJJmULW8uQDyiHE8Fxe
-rdDe5qoezhroyfBotgiCA5FcJN4SvQkx9WKzjCArkqFqGmp3qrrhqKY38c32xI3k
-+ei5Sow8uRDhRsL3tIeJ
-=9suQ
+QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluZEQP/1tkmdJqpjHvHVMXZOfyaHdT
+9uPPPiyB8AHh0Pz+YLj2ScAqKUDTq6s/t6s3VmF03yIR7+N9hS7d4qCpGJkijK7t
+b7Hdtpm4HmitL+2cc2H06s5q0lmEpu4RL19WyMwmSlpF9mNSX2oP/deKHgLJXmaB
+jSmD8bttjTiE1DLUJmXwvfF86Qlmq0czbNRmC5+JESvtSBW+RJPHEhstjqcIr8ks
+qfvhb9apQQwEONr3e6rHXtFqEeOlh3aje3KDwJXOM0kgYRxTEgxk1sTD1kF0vXnA
+VX90gMhJbAifXp1fa0b6dF7pDL9wpoFJFKczOegU45MNTm7ArTw3thprlhYAZPjT
+hc+YF//aBC1IhoJqIwKj9Uo3J13Qh3B5XawEPzB+akn+Z+ggU+GtHjs5knXIk+vT
+8S2aIovs0bgW3dCXvNUxE5zUi20KQmHxgGxZ9k2IPJhxzr3892cVHLZ9AUnj5VWE
+DdEt50jyxf9TphDHX+mDXxiOG+uP9AY4SCoP3uzyD88rJ/NF1VNVyUO4OcqkrXU8
+O7382AtJZN3RUtJfoQjuuskBegNcQKEUy+Hwo4GkQ4RySeJ2Wv0tlS/GMh0i/uTs
+kIcr7WBOb+e1ScN9Y+17b3+JWiH0H7ppqFWL7nu2PuFsLNuIlqcUNM7lD/nTPB1G
+EjODJrcx2//K11ha1Mat
+=eBEg
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild
deleted file mode 100644
index 68250c92abab..000000000000
--- a/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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-r1.ebuild,v 1.4 2013/07/30 18:59:51 mgorny 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-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.
-
-# Note: replace emul-linux dep when expat becomes multilib-aware
-# (and add [${MULTILIB_USEDEP}] on it then!)
-RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-1.95.3
-	abi_x86_32? (
-		amd64? ( app-emulation/emul-linux-x86-baselibs[development] )
-		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
-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"
-
-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 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
-		--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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.10.2.ebuild b/media-libs/fontconfig/fontconfig-2.10.2.ebuild
deleted file mode 100644
index 748e3627fe16..000000000000
--- a/media-libs/fontconfig/fontconfig-2.10.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.3 2013/03/09 07:26:03 zmedico Exp $
-
-EAPI=5
-inherit autotools eutils libtool 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 ~arm-linux ~x86-linux"
-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 ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_configure() {
-	# always enable docs to install manpages
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc docbook) \
-		--enable-docs \
-		--localstatedir="${EPREFIX}"/var \
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts \
-		--with-add-fonts="${EPREFIX}"/usr/local/share/fonts \
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -C doc install-man
-
-	find "${ED}" -name '*.la' -delete
-
-	#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 ${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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.10.91.ebuild b/media-libs/fontconfig/fontconfig-2.10.93.ebuild
index c6f870cbe3c2..20ae0349f4b5 100644
--- a/media-libs/fontconfig/fontconfig-2.10.91.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.10.93.ebuild
@@ -1,10 +1,10 @@
 # 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.91.ebuild,v 1.2 2013/07/30 18:59:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.93.ebuild,v 1.1 2013/08/21 08:42:47 yngwin Exp $
 
 EAPI=5
-
 AUTOTOOLS_AUTORECONF=yes
+
 inherit autotools-multilib readme.gentoo
 
 DESCRIPTION="A library for configuring and customizing font access"
@@ -13,31 +13,27 @@ 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 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~amd64-linux ~x86-linux"
 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.
 
-# Note: replace emul-linux dep when expat becomes multilib-aware
-# (and add [${MULTILIB_USEDEP}] on it then!)
-RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-1.95.3
-	abi_x86_32? (
-		amd64? ( app-emulation/emul-linux-x86-baselibs[development] )
-		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+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-utils[jadetex]
 		=app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex]
 	)"
 PDEPEND="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.10.2-docbook.patch	# 310157
 )
 
 pkg_setup() {
diff --git a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
deleted file mode 100644
index 676ede5679ae..000000000000
--- a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild,v 1.4 2012/05/05 08:02:34 jdhore Exp $
-
-EAPI="4"
-
-inherit autotools eutils libtool toolchain-funcs flag-o-matic
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
-
-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.3.2-docbook.patch			# 310157
-	epatch "${FILESDIR}"/${PN}-2.8.0-urw-aliases.patch		# 303591
-
-	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
-}
-
-src_configure() {
-	local myconf
-	if tc-is-cross-compiler; then
-		myconf="--with-arch=${ARCH}"
-		replace-flags -mtune=* -DMTUNE_CENSORED
-		replace-flags -march=* -DMARCH_CENSORED
-	fi
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable doc docbook) \
-		--localstatedir=/var \
-		--with-default-fonts=/usr/share/fonts \
-		--with-add-fonts=/usr/local/share/fonts \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install"
-	emake DESTDIR="${D}" -C doc install-man || die "emake 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 ...
-	# <azarah@gentoo.org> (11 Dec 2002)
-	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
-}
-
-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
-
-	echo
-	ewarn "Please make fontconfig configuration changes using \`eselect fontconfig\`"
-	ewarn "Any changes made to /etc/fonts/fonts.conf will be overwritten."
-	ewarn
-	ewarn "If you need to reset your configuration to upstream defaults, delete"
-	ewarn "the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-	echo
-
-	if [[ ${ROOT} = / ]]; then
-		ebegin "Creating global font cache"
-		/usr/bin/fc-cache -srf
-		eend $?
-	fi
-}