clean up old ebuilds

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

8 files changed, 24 insertions, 891 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index dd9fb796b2b0..9c061507b0cb 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.205 2015/03/31 19:31:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.206 2015/04/06 06:58:30 yngwin Exp $
+
+  06 Apr 2015; Ben de Groot <yngwin@gentoo.org> -fontconfig-2.10.93.ebuild,
+  -fontconfig-2.11.0-r1.ebuild, -fontconfig-2.11.1-r1.ebuild,
+  -fontconfig-2.11.1.ebuild, -fontconfig-2.8.0-r1.ebuild,
+  -fontconfig-2.9.0.ebuild:
+  clean up old ebuilds
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> fontconfig-2.8.0-r1.ebuild,
   fontconfig-2.9.0.ebuild, fontconfig-2.10.92.ebuild,
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 8b28c6a0c1e1..3e5a57734f01 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -18,32 +18,27 @@ AUX fontconfig-2.3.2-docbook.patch 506 SHA256 c6480dcf19fec22126a9205fa3d9b317e5
 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.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 4313 SHA256 440dde767dd92ef8c12f275e72c44b0e68ab33e25968dbb89d88646cd19a454c SHA512 10f5dd710cb14ee732c92f37d718fa60f1695a5f85a35f5162fd555473fb07973abe2972416cf3e5ba78693c194a8b6d29b4a89c3932228c695eea24154b1866 WHIRLPOOL 187c811266addf63321b82e25282a6a0530328199932253a0bb939e6772b7418a6be514278580ecf61056f14a12ebc83bdb6ebacd07327832367bfea68c33342
-EBUILD fontconfig-2.10.93.ebuild 4720 SHA256 f1d57663b1742b67fd655b244d48dae1ba53a624cdb6a55719a8aefd6775ac41 SHA512 e57ff2e1b694e6c806bbad3d490ddabc9ade1c68d86d1f7ac16c90004121cc0d25a1708c39ec4e859a07c272d9c418055721095d37e3f9e67899514f6acc4e11 WHIRLPOOL 33f3fa0fb42c7e63c2b984ad599e02cbe6d4406e6455cd60a2c3071350f1b5b6427d938b1c282fdcdaa9abdd76dc824e08d2af77bf04944ba1c49c33f1790cd9
-EBUILD fontconfig-2.11.0-r1.ebuild 4901 SHA256 ffd7a01070d074734a752088ead6c4911389a628e222b2fb3f83f17ad810a96f SHA512 0feeed52783ae1960aa5665f40aa4b7b4dc57d8564cbf2061edcb662475bd4e651710c8126e4045da050fa2f819c114459313fa07131dad42750180d6db37465 WHIRLPOOL 1b89cdfcfc8ec497e91ee5c0918db984f814170d685a22773e154fc60ed4ec111e381bc6efc73b8dcda04bbaa7772686db320a77b93acbaa625847177f90bb4a
-EBUILD fontconfig-2.11.1-r1.ebuild 4885 SHA256 6549723f1ed715e351639bad5095f2dee0c59a0977f4d05d2732533e1b7f18f3 SHA512 663a9f72d805ab5ab818890f6a4e22d112baa207fcee24e29b04065dc5a6e78a4464d9b020a0ee374fd5ef01c1f90c81f5741bf43037df319cab510605c54a4d WHIRLPOOL 43fefdf29e41444dda806ba984a4a36605bc38658e585a970746bf7be79c46257caceb1cd6b7c8beb3ee4dbee713a50c0d08f96780562a899033d721b593724a
 EBUILD fontconfig-2.11.1-r2.ebuild 4932 SHA256 faf99b22b3a9d96428cc87b4f614a64498bd19e63ba318b4c4fb49cff064c896 SHA512 7179d68227e73631e699fd42d0b374aa7daa47dc38d0bc3a5f0ee108d99259497bf16c8ec3bbb78d1d3c8384c76fc892b2a4d179f916249de82a24cc826625c9 WHIRLPOOL fab9143f343ae44e9fc883c80b2beb1c8c899b0906418cb4e6dc95455640a0a0294ccd9c6bca475fc9c33064360b45fede9946f138ddcd6444bbead8bfd58480
-EBUILD fontconfig-2.11.1.ebuild 4727 SHA256 230e60407378c73a2b59c70ec2b213e7f43ef0276249afdb8e6c538267902bcb SHA512 aa4be01682b224dc788d329baba092debdaf0e7948785d10259f60e3afc1fca7167d5827d2938865e05b22328e3a4dd0c0b0430c852aef6d2b939c1d1a146515 WHIRLPOOL 385d59c5a2e23aaa604026ded611d731dcf179ff591234169db1f465b912889488272a60a5ffb16b011ecb8732a2149b544fc689d7e3483f9a84075edfa356d8
-EBUILD fontconfig-2.8.0-r1.ebuild 3979 SHA256 42f7aaad78ff02692fabb22ac234d18cfd8544807f657151c7b44f214669ea3d SHA512 38d4135356ba3ecfaf38a92d453c3847cb2b27f554eecd3eb747ec1d103d55acae0b0da3d10453a6240dff1f148c695ef61541d8ce60a7e91ed8e773337028df WHIRLPOOL 5ff698dd96237f8bf71126cbec4558499a24fbf4207495c96399a7df6477299be3a972b1f54f7310099a42daf5c2e42330243373a3711cd8ae1d25359d4f45fc
-EBUILD fontconfig-2.9.0.ebuild 4079 SHA256 1aaaf11e2d96b51a5898aae4c263e9cb829a0a577d447bb7717b0bbcbc2ca70d SHA512 c236dfd634fc38917543f785d8a9559d03249981a1eae4cdce6b841bcc9d7cd3e322e517ff0c726293c3581fb7f4736356934b6518a6a192641d3f2c9236ea09 WHIRLPOOL 8145dc0af19afc798a0d26ad375000c51afecebe476b1d40e5022bdb44acac50fa934a5bcf3839a335cec58a7cd25bf63b851fbb70ff37884b4d99bf518fdad6
-MISC ChangeLog 32857 SHA256 1d91494bfd8c2c8917bfd378d71d429a7a6d7a57a16a3ddb9d3a734fdf499ab7 SHA512 d8f2cbd560ce18ca2086d7dffd02a85230ae45ab5d9b615806c73b631a6b2eaf8dcfdf25ba4f7d5421a27c94a09a07524288dc93462bff6ebe9b04a4fa56b267 WHIRLPOOL a1d9923d48fa78827a49fcbe45f5047e0ddef4c99ef92a6c523331ee61efb84302a0c863caae1c934bd0a50027834fb8be2a477ccb92c11610e9f14347ca7502
+MISC ChangeLog 33108 SHA256 3dc573b11acc993266e95d92f7de822085533186e0564bb9de14edfe983f2f2d SHA512 11bee190990418211c01d6def3e3605e69c292f2ca594745a1d7cd6775eca084edae17f18b533a0828bfbaf21a5958ddecec57132764f89056a49a4fad84a900 WHIRLPOOL 185c47061fd605f657f801edb3f5f14bcc17791495ae39ba0e2a40b57c3016d423af402a7642f2dc08e377da493d626c7e5622ad536d2a498878730f1f02facf
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJVGvX9AAoJEJQzkH1pP7W4HmEL/i+YuCBkU8TSqU4+rxZP4BF3
-WyPxZ7Gfm/Jg8rEjMJABvImjUUHYu/AprWuTtwnEZslZAxbqzJKIASsuwFv+VeS9
-HUyP57NJd1mQ5zUIc2pyYbTj2WKt4Y4PLyD4teBSmuk3PpgnjTYS2mVrXYCFNa37
-fpLWbVGmMyU2CdfU9Q8nyYEjrZ961++Tx2fuK41Aad/zSTA+CiJ8pT7JQvssj8vL
-cLJCKdCZOJWHOT6d52b2BokkyBnSihMlSiLsjcXG1r0vD1s46NTs1xz5V2uEuPEc
-I1N4RDkPAedI7+1S6XXsgEaxJfaMLE+Sw138EsLSujK+bQIQGKxTuQRA6x4d4iL8
-vGHFnRb/cQJLO83nYKIv2D7Nofk1UmjJWpsplTKGttl1RPrYgvC2/yjy98R0Pslk
-SNMcPaXodeC+tixYBp/rpQPriCY9YDqZupsRUmEd4RiyZBiWh1tDzqUwOsHwVX3N
-CMrQhlPn26Ujf8ol3cnwSLySlDPtb62oJqomu8daXA==
-=8jP8
+iQJ8BAEBCABmBQJVIi6bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOXocP/R0qC2A85j9pXbHdbprCqr3F
+2zDhUds1baWiqLRUf6xfhHna1fAJSYS0v7ERdPZBKxJxzejiLC63hleftUSItXmT
+7Lxp4tUoYpYi2nzclpNoYSb7g8ruRXm/abr6uDTok/NqiGn/mfEYR49edplOOGRD
+Jtesvt/eePJ/l9n0NaJymHZ1NyfDNShUwDBLpGWn3UXGesQrLLslmKb3L2acA8u+
+SDSXPAqzgfnz9Hbw1NPAsS3xcUwY6U3KQHmCKdxxGBJP9yCiCRN6I0x5ALyQ+mIw
+ItuwQd3N8/6nXljrGwch/MJ8vo8LEzj41yTYS9+b9i3HUeOxkKkMBOc3VvVRGn9A
+w+2IPOo8Ho0NMXRkQFOdPRy2JcnF7buXxE6gYeED+qOZSmhn8yzdIQM+ZJb8kb2O
+esS3C2Hh5RxVGYgiWFOa9xWZrgXXioHF7UsXKOGlRYm6fnAMYgNRbDqf0vxUgmnm
+mYE/zzfulZ1rg/CQRid/ANRjA6mDIS2S3K+HGziK0yfgO/VXgjcfkSMzCjNKl6t7
+gBGCz/SCtlDPHu/wvG/qvSrjmXgdmGc7+ckAdiNvXRaCp0O7JNnkXIq0ImN9J2IC
+j3DDd6pEkFX93RZAZjfDE1Vk8WV5cb8RaT7qfTFArKHKI86rmOS3ELNyHc30CNp4
+Witeg/38ZgZQhDBjKQG8
+=Gg4X
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.10.93.ebuild b/media-libs/fontconfig/fontconfig-2.10.93.ebuild
deleted file mode 100644
index 9b7ad7383b63..000000000000
--- a/media-libs/fontconfig/fontconfig-2.10.93.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.93.ebuild,v 1.5 2015/03/31 19:31:04 ulm 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 ~arm64 ~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-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.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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.11.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.11.0-r1.ebuild
deleted file mode 100644
index d7277ab59c2e..000000000000
--- a/media-libs/fontconfig/fontconfig-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.0-r1.ebuild,v 1.4 2015/03/31 19:31:04 ulm 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 ~arm64 ~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-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.7.1-latin-reorder.patch	# 130466
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch	# 310157
-	"${FILESDIR}"/${PN}-2.11.0-solaris.patch    # from fc git
-	"${FILESDIR}"/${PN}-2.11.0-solaris10.patch  # from fc git
-	"${FILESDIR}"/${PN}-2.11.0-baseconfigdir_fix.patch # 498246
-)
-
-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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.11.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.11.1-r1.ebuild
deleted file mode 100644
index 131faa203dc1..000000000000
--- a/media-libs/fontconfig/fontconfig-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 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.4 2015/03/31 19:31:04 ulm 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 ~arm64 ~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-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.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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.11.1.ebuild b/media-libs/fontconfig/fontconfig-2.11.1.ebuild
deleted file mode 100644
index cb9dfacc2f92..000000000000
--- a/media-libs/fontconfig/fontconfig-2.11.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 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.5 2015/03/31 19:31:04 ulm 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 ~arm64 ~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-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.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
-}
-
-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
-		ebegin "Creating global font cache"
-		"${EPREFIX}"/usr/bin/fc-cache -srf
-		eend $?
-	fi
-}
diff --git a/media-libs/fontconfig/fontconfig-2.8.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.8.0-r1.ebuild
deleted file mode 100644
index 4ea3bd9cbc25..000000000000
--- a/media-libs/fontconfig/fontconfig-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 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-r1.ebuild,v 1.10 2015/03/31 19:31:04 ulm Exp $
-
-EAPI="2"
-
-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 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc"
-
-# 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-eselect/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 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"
-
-	#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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.9.0.ebuild b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
deleted file mode 100644
index 7ab42a3e9694..000000000000
--- a/media-libs/fontconfig/fontconfig-2.9.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.9.0.ebuild,v 1.4 2015/03/31 19:31:04 ulm 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 ~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-eselect/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
-
-	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="${EPREFIX}"/var \
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts \
-		--with-add-fonts="${EPREFIX}"/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 ${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
-}
-
-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
-
-	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 ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-	echo
-
-	if [[ ${ROOT} = / ]]; then
-		ebegin "Creating global font cache"
-		"${EPREFIX}"/usr/bin/fc-cache -srf
-		eend $?
-	fi
-}