old

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 13 insertions, 361 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 789ce4191bcb..a8c60d51fbed 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.334 2013/04/27 10:25:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.335 2013/04/27 10:27:39 ssuominen Exp $
+
+  27 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -cairo-1.12.14.ebuild,
+  -cairo-1.12.14-r1.ebuild, -files/cairo-libpng16.patch:
+  old
 
 *cairo-1.12.14-r2 (27 Apr 2013)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 19c42387ac9e..29baa2997851 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -11,7 +11,6 @@ AUX cairo-1.12.10-xshm-corruption.patch 1039 SHA256 3bf1147514160a76dbd6282e1e1b
 AUX cairo-1.12.12-disable-test-suite.patch 461 SHA256 da474e8982b1177ee6f8df70ce0867ee4e451a1ff6a94dce53ca2d62a936cd95 SHA512 1985a369fd6d707e816d9bb22aed89039b09fee105c84ffa4c63232dba15e87f12888d6ac735c766c075851e64e53c052df8af1eef08a75d6b908a5244ae2303 WHIRLPOOL c4ad092277b83d110094400af19f98b569297359be32b3e9a07a6e46acd43bcbdc3721838e833180809d647a2c7b941c9be1e8a00a437c3de3602dd8935610b2
 AUX cairo-1.12.14-libpng16.patch 1525 SHA256 f1af9d30e658b795062a42be3ef0bd0e215a69d7f8d3d295910a2459cf7aa21a SHA512 94483ddc3dc6ad4ff6e37c902e845d38375485077fbb682b512ead0b62abbe6708ad4e708bf84abb877c993b938c3412d581b42248ad3e2b77eda03c98437808 WHIRLPOOL fb5721a399059fbc1ea324192b5cd0ce63c9604f8cd3df9ecb51a239b9479450a2cba3786594a5ffec111212daeb72d6a5f14dcff9d081757a97b5344edbd6c0
 AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 SHA512 651b73124ee5b65e2735deefde36727122e9c513da134441be923fb875aedfd3dbd81de8652e3919f3fa04d1de13dee6ec28e4fcd687aaec427d3b0dd94ac703 WHIRLPOOL a1803cbd8f32a8e926a8af932e099c5275920e3e09f7a53ee49898823e81ee7a2533a4db8d2125f200fa409d98fb8e2cbdeb01f00f64b7ba64ba8dffb8487bc3
-AUX cairo-libpng16.patch 1750 SHA256 80493f7340523ff25b1651ddad9ae052fa982a5361e528cf3d5402b664bfce41 SHA512 46f20a84217e5dd0c1197749eeead506995677b76b0b3a6421a2aee639793735632f5084429c72b4d7482eddb5fee3b5f3b22a4b17f552e320afd77abaee5e78 WHIRLPOOL 55f787a1e8c968225eaa333e64ae0e7b7f48b94d38a84a994ab0ec053f5916a4080bb536e858402e2e4db988b7346d7b3a3844e9bca5a3d1f77296a1e7abf6c2
 AUX cairo-respect-fontconfig.patch 538 SHA256 1732f21adfe5ab291d987b7537b13470266253f599901a4707d27fd2b3d66734 SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e WHIRLPOOL c7d8f364a787b095054507a6dceafe08e8112322853e261303adc07b79a9070be63200dbd4ff465943e2303126bcd7eec51b0f6c53f1d4e9a49fd363acbccde2
 DIST cairo-1.10.2.tar.gz 23558405 SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 SHA512 8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a WHIRLPOOL 8ee0e6f2f520a8e5e046a311926f07a49dd7b730b66b49684ce0ea296b9b5822a80a194b8eff56c73d92da850faa15fed925a1df41b3ea28e3841530548d4ef5
 DIST cairo-1.12.10.tar.xz 42135592 SHA256 f1581aef210f6caa9cf42875fb66ab3b47a32db9436bdfa9913b9bbd5034b03b SHA512 e56bd3973039bc0dd48fb9e89b17a58e8061fce2628403e2c1256209cf66ef1b50af1c9a28c4a75806066416475515b75f76de845e2e6735fb273e6ddda3a160 WHIRLPOOL dbce51bbe1732076b770cc6928caac007eb0e69bcb392ac9c82d17a203defcbb732d7bf8d8b020c3d04937d4a5df757600f1bedc51ea3d88cd41f6c44aeedf0b
@@ -22,21 +21,19 @@ EBUILD cairo-1.10.2-r3.ebuild 4384 SHA256 94a459c7041fbc68bea702c37dee51b97923d1
 EBUILD cairo-1.12.10-r2.ebuild 4008 SHA256 2a07f7d76ab06fb01ebfeaaa6e0c06f9e3eec13268e806796e5f5d09aa50e9d4 SHA512 668da68dec58b52e823937431582795e6b6b699a4a11eb9a92169f052f89d60d495a5bf955b06f01ef9b8ed310363d4e2c4af1a73686b0807f29dc913a258b63 WHIRLPOOL 672582a833a80203295d5fed1681ef72823f2f33a674431902ddf0d1b70802dd7d35c9cce1dcb62cab37268451a2a7699d09f60a06cffa17f706ca04fa044837
 EBUILD cairo-1.12.12-r1.ebuild 4064 SHA256 d10f80a855542c6a22c6399aa6e18c91a10d6cd5eeaaed88bcb953ff41706f5c SHA512 9106521698f9c8cb003dda679d795807a742c60b3afab041df197f84a696259c01935b2613b1a8186ea98f795e4e00be860324e7bab38d6b4f6573f39a976d43 WHIRLPOOL 8d765ea2f8b74b699dd3213187ee4102688b0d4a764cbc00f6304f3a760d5bea4bd1b97f207dc28ef0a71252e05e7d751ba4fe9398146ac3ab657d2cae092cae
 EBUILD cairo-1.12.12.ebuild 3970 SHA256 4e5a30d52b663cab1a271e8c632d41587baf035f0db7a704f31d4c6ea8fce479 SHA512 e982ce45c10aee5c30f1bed54e2aa3c3b17b2a26e8dff4054955a4617a366ea01905c8d8121da8b91d57f6cdb97cad3b1edd42faf068488f40bbcb90076a1e16 WHIRLPOOL e5193d6dd6e7b52f091d08de1bfeb6e05a9d19ddccecf883a86e0dbe6a933bd2b887e289a536affdc0b4face528c47bb9052324b03eae12201f482fefb2a6101
-EBUILD cairo-1.12.14-r1.ebuild 4142 SHA256 c7cf518261cf4cae4d4100c45da840ab24b66e16d87ec9fd8725261fc0343bbc SHA512 0f3238fe8b71122aa06a80e649b16f43d5b82cea59dd5a411e5797c35d5c48b142dea8dc0e6130aed8a53b4f3e5db92d055072b1764a3dd2ecf7044975c86185 WHIRLPOOL e50a667e9921200e2cc61635f688a3cbf6e0ba16db831cde63257c97836cdddf9d97ea3160e7adbdb173f72c004a58496a83053edf8e9fb688d44dcfbc58aed4
 EBUILD cairo-1.12.14-r2.ebuild 4072 SHA256 7751da8d2c9e49d7790aa2071868d340952c744edf8f49e8b75def6a99e83049 SHA512 73b1b9f6c29969a7dc1c114c6fc143caf288468fb15ae3adb46fa33228685561596609f088e750e2dbb77478a220fca319e178ff439616d176fba95bd2837a75 WHIRLPOOL 30fb79cde036185635c939f3eb0f1064364f4c4161b27fbeb0897d283677bf8f843da370e8eeb48eed28410c395cc3d55515ae6d74770c7a69c61b20ece4d719
-EBUILD cairo-1.12.14.ebuild 4064 SHA256 c471b151d44577403db207d354dc75c91f342f0ed1e7308db5d47979cb2753a6 SHA512 832ea8f9b33a76c37a41351f93e5133dc4e38b0feacd33594fbae2ea43df5a9d011cff9c6cb8989e6e5be14c37a134027a24b89cca8241031af69611063c8c4e WHIRLPOOL 1bd2d3642a736ed82673d1978e4944b0177f3db2c95b96000a399da8fe0deb860bc21a997de8ac84f156600811f92d904cb0a4a47623a7a995cef3ccb224e0e2
 EBUILD cairo-1.12.8.ebuild 3904 SHA256 4fe87359c63f2097c219ef1e701016516316ed05fcbb8160be940d9d9e0b7bb6 SHA512 8da56cca2a1f5348168102b4880489f5f4c9de843a5a08a035ebe3a0dab509f18ccce81eb00befedb9915070ca65c95539c32c7df7905ae08685a4c702cce53b WHIRLPOOL f7b95a469bb32c3d98989e59160c7b7fa8565625c12fe8bc64da301492f98f3e4f16741a2f8aed4a3bf4f517ab445913af0de79ee4c60f5f7684c91c7bfafe31
 EBUILD cairo-9999.ebuild 4007 SHA256 9f2dbcd21b11ee3036d0bd7a350720b4a37337a45a988b763d52a40229af72e5 SHA512 c42e19feaddbf018eeef02549dae0d61ab67e3ae599d67b5d9d47f0126c1c304529ee6eb836bafe8865bbd0ddd52182016e9febcb45ab6bdb9ae8c53425e72c6 WHIRLPOOL 11959b93e814adf2cf9b5f7b613c8b396b96bbec8a762f12f1dbc9478cef7cd0a674494dd380f254ab9c3955cf3b233d53205977098b3ccad2eb7ed200b72cc8
-MISC ChangeLog 49279 SHA256 0bff5ee9d22a2e3b38a069584d6bfec76f59ae213e43bbe496da6675b4220c58 SHA512 ff0639afa8140d19a0e5e7fcdcfe3dc7048eac3f4f0a5b75b35610d8c2b1469c0a986b8784a1e2b9fc991a151cc0d08ba87328383fe26d6efcefb49981d660e3 WHIRLPOOL 0c7c3e2345206a71c42e859abe6857dc98ba963823a8f02b646d65238544cb8f50226138ddcebbc6219607d9215605787063e7cc740b118cfd55f14e861e656c
+MISC ChangeLog 49420 SHA256 9e9da76a976b0d5d717accf13851b5e815a62cddbdd4cc8fdd30229c837ff775 SHA512 cb2e944b512de7f5359065abf8a07ed95d0bcae11b61b350dbb386c2cc1bf231037e63503f777061fad39075da2a94829e45561a34e810c5cd157c26d7218f7b WHIRLPOOL 5f0b2b413bbb48ddbb0da7a5c1686e10dc25c0e32d1d130f641bf96961f188e15438d1f7e3bd57ae510089f112fc8a7659e4ccf03824a80d1e039fe8762cae17
 MISC metadata.xml 798 SHA256 f9797b2bdea41285e7b75db0f303570d00928b6135f40f869584e77c4dcdfeb1 SHA512 6cf758886d5711ec28d0f4e37f8c5fd863827c69c43930a3bc5755f397838f8a209dcc7f4652cd4d61a126bceb5565a60675ed7d941f49d67ef8a6e2b2b496e1 WHIRLPOOL 40b5b64a9933fa7facc9842409e0f4b4612d74bc940ccf6ec701da649af54507f95abf35820fe3d629e1c0cd15185c881a528e8e4a738375756a74936cb6cb46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRe6cuAAoJEEdUh39IaPFN7lcH/3fO8RwOwjx0wDwd2J+qYcS1
-sNAW9lGKbeYxLaB+02SbkCqW8hA/A9K3FRsJRXmFxKxj3F1sWVCfsBNMBmxdAkuO
-X11jKkXI4i6tZNLnf5vli4ltN4kVBimXIO/s5oVPB+6VJ0OUzq6MQE5pBNvruBfb
-bj9kpCZHxKTHmi7WSk1+9NTIZf6dYxDaD8MMOvBIWsIIopiYbATXHCYIg5NDEq9s
-NSdo4mur7QH7mlbEaoYe8mlQ7KN2JCnAoUQJ8/PZHW3cAC/1gn/Ei83lwD5rfp9P
-ME5HI/BSNMoAjssnbcE9jNXd+z911i7x62TX8/fsTaCl1JLiyUKlqpRSeWXjD7Q=
-=Zj4n
+iQEcBAEBCAAGBQJRe6fCAAoJEEdUh39IaPFNqXQH/0MjgdcfxhpnnYnWdT26YIUT
+cfBxWgdOgY5hvlCSz/N3WULOSlTdtgHmoLMNMRvjAib18/yhlytdXObbHwwdFvIu
+ubjba6/F0Bcve4JbbasIhVw7RteN+aOc5eZ79Iixs8jElOVsexGWoNJrAdBZ/9Of
+P2OqjvwXbBoEM+aQjUNGamIvX+NstLAQK3U7Kge+CA7HMSzPaxUF0Dp2tvaaAWU2
+9F/Xi8WFeZhhW7l5MUFRJkYIV/HQCe6SzCtZiT+VAbly8RJw8BhsJpXfU3uP9/Xa
++iV6xMiajpSvZxJ3nwgGYjMHrjPm9De1ZiohWpL/ejn8nUVecVg8gYNeyZ8hHr4=
+=Ppvi
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.14-r1.ebuild b/x11-libs/cairo/cairo-1.12.14-r1.ebuild
deleted file mode 100644
index 4c455da67a0e..000000000000
--- a/x11-libs/cairo/cairo-1.12.14-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.14-r1.ebuild,v 1.1 2013/04/27 05:20:41 ssuominen Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/zlib
-	>=x11-libs/pixman-0.28.0
-	directfb? ( dev-libs/DirectFB )
-	glib? ( >=dev-libs/glib-2.28.6:2 )
-	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
-	openvg? ( media-libs/mesa[openvg] )
-	qt4? ( >=dev-qt/qtgui-4.8:4 )
-	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		drm? (
-			>=virtual/udev-136
-			gallium? ( media-libs/mesa[gallium] )
-		)
-	)
-	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
-	X? (
-		x11-proto/renderproto
-		drm? (
-			x11-proto/xproto
-			>=x11-proto/xextproto-7.1
-		)
-	)"
-
-# drm module requires X
-# for gallium we need to enable drm
-REQUIRED_USE="
-	drm? ( X )
-	gallium? ( drm )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
-	# Commented out because the correct fix is part of libpng-1.6.2 wrt #467426
-#	epatch "${FILESDIR}"/${PN}-libpng16.patch
-	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
-	epatch "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
-	epatch_user
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	# SuperH doesn't have native atomics yet
-	use sh && myopts+=" --disable-atomic"
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	use X && myopts+=" --enable-tee=yes"
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# --disable-xcb-lib:
-	#	do not override good xlib backed by hardforcing rendering over xcb
-	# --disable-valgrind:
-	#   valgrind code is busted as per upstream
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable directfb) \
-		$(use_enable glib gobject) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable openvg vg) \
-		$(use_enable opengl gl) \
-		$(use_enable qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		$(use_enable drm) \
-		$(use_enable gallium) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-xlib-xcb \
-		--disable-valgrind \
-		${myopts}
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/cairo/cairo-1.12.14.ebuild b/x11-libs/cairo/cairo-1.12.14.ebuild
deleted file mode 100644
index 197b6c0916c9..000000000000
--- a/x11-libs/cairo/cairo-1.12.14.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.14.ebuild,v 1.2 2013/04/11 05:20:33 polynomial-c Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/zlib
-	>=x11-libs/pixman-0.28.0
-	directfb? ( dev-libs/DirectFB )
-	glib? ( >=dev-libs/glib-2.28.6:2 )
-	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
-	openvg? ( media-libs/mesa[openvg] )
-	qt4? ( >=dev-qt/qtgui-4.8:4 )
-	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		drm? (
-			>=virtual/udev-136
-			gallium? ( media-libs/mesa[gallium] )
-		)
-	)
-	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
-	X? (
-		x11-proto/renderproto
-		drm? (
-			x11-proto/xproto
-			>=x11-proto/xextproto-7.1
-		)
-	)"
-
-# drm module requires X
-# for gallium we need to enable drm
-REQUIRED_USE="
-	drm? ( X )
-	gallium? ( drm )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
-	epatch "${FILESDIR}"/${PN}-libpng16.patch
-	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
-	epatch "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
-	epatch_user
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	# SuperH doesn't have native atomics yet
-	use sh && myopts+=" --disable-atomic"
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	use X && myopts+=" --enable-tee=yes"
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# --disable-xcb-lib:
-	#	do not override good xlib backed by hardforcing rendering over xcb
-	# --disable-valgrind:
-	#   valgrind code is busted as per upstream
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable directfb) \
-		$(use_enable glib gobject) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable openvg vg) \
-		$(use_enable opengl gl) \
-		$(use_enable qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		$(use_enable drm) \
-		$(use_enable gallium) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-xlib-xcb \
-		--disable-valgrind \
-		${myopts}
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/cairo/files/cairo-libpng16.patch b/x11-libs/cairo/files/cairo-libpng16.patch
deleted file mode 100644
index 0110c42d0ee4..000000000000
--- a/x11-libs/cairo/files/cairo-libpng16.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-http://lists.cairographics.org/archives/cairo/2013-March/024195.html

---- src/cairo-png.c	2012-03-29 12:05:32.000000000 +0200

-+++ src/cairo-png.c	2013-03-30 09:13:50.817181600 +0100

-@@ -497,6 +497,20 @@

-     }

- }

- 

-+/* branches into premultiply_data or convert_bytes_to_data depending on color type */

-+static void read_user_transform_func (png_structp png, png_row_infop row_info, png_bytep data)

-+{

-+    switch ((cairo_format_t) png_get_user_transform_ptr (png)) {

-+        case CAIRO_FORMAT_ARGB32:

-+            premultiply_data (png, row_info, data);

-+            break;

-+

-+        case CAIRO_FORMAT_RGB24:

-+            convert_bytes_to_data (png, row_info, data);

-+            break;

-+    }

-+}

-+

- static cairo_status_t

- stdio_read_func (void *closure, unsigned char *data, unsigned int size)

- {

-@@ -623,6 +637,9 @@

- 

-     png_set_filler (png, 0xff, PNG_FILLER_AFTER);

- 

-+    /* this must be stored before calling png_read_update_info */

-+    png_set_read_user_transform_fn (png, read_user_transform_func);

-+

-     /* recheck header after setting EXPAND options */

-     png_read_update_info (png, info);

-     png_get_IHDR (png, info,

-@@ -643,15 +660,15 @@

- 

- 	case PNG_COLOR_TYPE_RGB_ALPHA:

- 	    format = CAIRO_FORMAT_ARGB32;

--	    png_set_read_user_transform_fn (png, premultiply_data);

- 	    break;

- 

- 	case PNG_COLOR_TYPE_RGB:

- 	    format = CAIRO_FORMAT_RGB24;

--	    png_set_read_user_transform_fn (png, convert_bytes_to_data);

- 	    break;

-     }

- 

-+    png_set_user_transform_info (png, (void*) format, 0, 0);

-+

-     stride = cairo_format_stride_for_width (format, png_width);

-     if (stride < 0) {

- 	surface = _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_STRIDE));