Version bump fixes bug #351319. Drop older.

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

9 files changed, 21 insertions, 275 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 201579d26fcb..b0edef273cea 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/cairo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.265 2010/11/06 15:34:56 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.266 2011/01/11 18:58:37 scarabeus Exp $
+
+*cairo-1.10.2 (11 Jan 2011)
+
+  11 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cairo-1.8.8.ebuild,
+  -cairo-1.8.8-r1.ebuild, -files/cairo-1.8.8-libpng14.patch,
+  -cairo-1.10.0-r3.ebuild, -files/cairo-1.10.0-buggy_gradients.patch,
+  -files/cairo-1.10.0-install-sh.patch, +cairo-1.10.2.ebuild,
+  cairo-9999.ebuild:
+  Version bump fixes bug #351319. Drop older.
 
   06 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> cairo-1.10.0-r3.ebuild,
   cairo-9999.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 13c4c66d3e75..837abe42506e 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,17 +1,11 @@
-AUX cairo-1.10.0-buggy_gradients.patch 581 RMD160 077fb7a18c2840c0d637d2161ca9d244cb69608b SHA1 45f4b6a834cb9f1c153f092fba18416d257d71c7 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18
-AUX cairo-1.10.0-install-sh.patch 648 RMD160 3b0de896cc84205a174613c5ce4bdf860c5b41f1 SHA1 5bc3d3d12bce2ae3903ffb16be5761b341cf5a3b SHA256 2d491b8f07708d2465193423385fd422966573aa8add3e418df6c237e109961e
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
 AUX cairo-1.8.10-libpng14.patch 426 RMD160 f97e4f2d1e65e2c6a90c5fddbce66caeb4337bba SHA1 bb029f710432af7b24175aa941fc7cd3187ef767 SHA256 b090f829d3b9fb69b83bfa094552335b8382988d60ce7e46558c4069b8bca532
 AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299
-AUX cairo-1.8.8-libpng14.patch 461 RMD160 e6676e89f64ae2c1390315ad58d0c697acf66e9d SHA1 0a900ceb2b5fa9721687dc670a1b582fa6c59341 SHA256 d4391514334809b6a13c644d7655c02e5d1070d61653452ff93fcc44bf904fb6
-DIST cairo-1.10.0.tar.gz 24022822 RMD160 fa65d4f3926308857d13f3ed0c100f89f075dc01 SHA1 efe7e47408d5188690228ccadc8523652f6bf702 SHA256 0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2
+DIST cairo-1.10.2.tar.gz 23558405 RMD160 8c8de00120398fe2b3a60a08ff59a464b2eebf47 SHA1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
 DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3baed69298 SHA1 9202c14967a633a9e57dd203695896d0197fea8b SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
 DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
-DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
-EBUILD cairo-1.10.0-r3.ebuild 3933 RMD160 3cbe30b2673e704551bff2d159c04f206c3275bf SHA1 6ea4b26562912f225ea7462dec1ced3e5bd3384f SHA256 6a56c274ddb1ae95404fd69fc2588fdf6c1ef4f39d5870bee0774248248144cb
+EBUILD cairo-1.10.2.ebuild 3763 RMD160 ab48930d896849a0031d89f5b54f89a91caf11ef SHA1 7246bde092155e411f9e378b14a4392208650bdc SHA256 b186c45e2624cd283a8248985c3606e5588b16c3be6b0ac57b180eb4bb6018ed
 EBUILD cairo-1.8.10.ebuild 3584 RMD160 f84813819ae4eff53aec7fa6adeb1380d2a6ff6c SHA1 a2b8b2693fd3c174e544295a5f32185fd0325c8a SHA256 32ccde6c82e9f803054507e2a30c0af119867a2b891c1e28146de933d22be425
-EBUILD cairo-1.8.8-r1.ebuild 3579 RMD160 a0bbaa9a2748d30bc408ad06b55d20ffdb3bb1be SHA1 ec55a981033137daf85a1c78ba16b3bdef23b7e4 SHA256 859054fa4543bc0d6fd0069f227c270cd7c505dafee3e20e85d25857ccbbf2aa
-EBUILD cairo-1.8.8.ebuild 3268 RMD160 93e9229cfa92173c2941f22a59960b52f3841cbc SHA1 f505952d4df79f73f95e90c0415c1bd58f51df10 SHA256 c50936f777d7a29b223ed4f80e192e11759c6a0f35779e2eaaa18aa9bbf89bbc
-EBUILD cairo-9999.ebuild 3741 RMD160 97ce1c4ff5a2d1640118e9d01df2d46cb0d36cc2 SHA1 cbb32d758a3440ccc469870fafe49a2cfacf89c0 SHA256 5e2e82f7324f22984ae1a631790f55939d6014e43029a9a707183c81509c1675
-MISC ChangeLog 37279 RMD160 d1bf9a65b8675a5334965216d8d348329f095cc5 SHA1 cf7f88b1c84f5a19825c34905c01c29b91981189 SHA256 52145d35646071b4e0f09e4e0f18aebe1157ef043ab1ee030e7c0e101b6bf772
+EBUILD cairo-9999.ebuild 3761 RMD160 6e95e7e5648852de269571e06d1c0e889705daf3 SHA1 9fc3b5ff5e430b5e7c03dcefd0cbef658308cd89 SHA256 5f3a700b76cb71b1a3c3879df48ed426266a4095ed417580fa1028799653ffbb
+MISC ChangeLog 37645 RMD160 96f46b4e8cde6b11e1843acff0d8b45a494de767 SHA1 796239c657aebd09e7f45de2200444d67eb9294d SHA256 c3372317c0d51d3933bfe64f9b5bfb532e53f91e6a70f3de5ff9e9b65a53631e
 MISC metadata.xml 1225 RMD160 0bcce59c006a84503e127b87439a006ce5b8b72d SHA1 67211092fe3e250141cd18bb38c29065025d4325 SHA256 3dc2eab1d6ee36a322501d54ba49e87b7d56c85ca8ae4c7edae2ce30014a7dc1
diff --git a/x11-libs/cairo/cairo-1.10.0-r3.ebuild b/x11-libs/cairo/cairo-1.10.2.ebuild
index 50731f769dea..59aae6499207 100644
--- a/x11-libs/cairo/cairo-1.10.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0-r3.ebuild,v 1.3 2010/11/06 15:34:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2.ebuild,v 1.1 2011/01/11 18:58:37 scarabeus Exp $
 
 EAPI=3
 
@@ -62,8 +62,6 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-	epatch "${FILESDIR}"/${P}-buggy_gradients.patch #336696
-	epatch "${FILESDIR}"/${P}-install-sh.patch #336329
 
 	# Slightly messed build system YAY
 	if [[ ${PV} == *9999* ]]; then
@@ -87,11 +85,9 @@ src_configure() {
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
-	# bug #342319
-	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
-
 	if use X; then
 		myopts+="
+			--enable-tee=yes
 			$(use_enable drm)
 		"
 
diff --git a/x11-libs/cairo/cairo-1.8.8-r1.ebuild b/x11-libs/cairo/cairo-1.8.8-r1.ebuild
deleted file mode 100644
index ee0742bf72dc..000000000000
--- a/x11-libs/cairo/cairo-1.8.8-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8-r1.ebuild,v 1.8 2010/07/19 14:39:48 josejx Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz
-	mirror://gentoo/${PN}-1.8-lcd_filter.patch.bz2"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cleartype debug directfb doc glitz lcdfilter opengl +svg X 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.1.9
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2[gtk]
-#	ps test
-#	app-text/ghostscript-gpl
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/libtool-2
-	doc? (	>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2 )
-	X? ( x11-proto/renderproto )"
-
-src_prepare() {
-	if use lcdfilter; then
-		# LCD filter patch from Ubuntu, taken from:
-		# http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/lucid/cairo/lucid/files/head%3A/debian/patches/
-		epatch "${WORKDIR}"/${PN}-1.8-lcd_filter.patch
-	elif use cleartype; then
-		# ClearType-like patches applied by ArchLinux
-		epatch "${FILESDIR}"/${PN}-1.2.4-lcd-cleartype-like.diff
-	fi
-
-	epatch "${FILESDIR}"/${P}-interix.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${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
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=$(pkg-config --libs glitz-glx)
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
-		|| die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if use xcb; then
-		ewarn "You have enabled the Cairo XCB backend which is used only by"
-		ewarn "a select few apps. The Cairo XCB backend is presently"
-		ewarn "un-maintained and needs a lot of work to get it caught up"
-		ewarn "to the Xrender and Xlib backends, which are the backends used"
-		ewarn "by most applications. See:"
-		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
-	fi
-}
diff --git a/x11-libs/cairo/cairo-1.8.8.ebuild b/x11-libs/cairo/cairo-1.8.8.ebuild
deleted file mode 100644
index 785aefd8b641..000000000000
--- a/x11-libs/cairo/cairo-1.8.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8.ebuild,v 1.18 2010/03/08 09:00:40 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cleartype debug directfb doc glitz opengl +svg X 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.1.9
-	sys-libs/zlib
-	media-libs/libpng
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2[gtk]
-#	ps test
-#	app-text/ghostscript-gpl
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/libtool-2
-	doc? (	>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2 )
-	X? ( x11-proto/renderproto )"
-
-src_prepare() {
-	# ClearType-like patches applied by ArchLinux
-	use cleartype && epatch "${FILESDIR}"/cairo-1.2.4-lcd-cleartype-like.diff
-
-	epatch "${FILESDIR}"/${P}-interix.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${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
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=$(pkg-config --libs glitz-glx)
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
-		|| die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if use xcb; then
-		ewarn "You have enabled the Cairo XCB backend which is used only by"
-		ewarn "a select few apps. The Cairo XCB backend is presently"
-		ewarn "un-maintained and needs a lot of work to get it caught up"
-		ewarn "to the Xrender and Xlib backends, which are the backends used"
-		ewarn "by most applications. See:"
-		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
-	fi
-}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index d47c6ad18ab5..57fbab4e1386 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.8 2010/11/06 15:34:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.9 2011/01/11 18:58:37 scarabeus Exp $
 
 EAPI=3
 
@@ -87,6 +87,7 @@ src_configure() {
 
 	if use X; then
 		myopts+="
+			--enable-tee=yes
 			$(use_enable drm)
 		"
 
diff --git a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index a58c2f8f4138..000000000000
--- a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch
-http://bugs.gentoo.org/336696
-
---- src/cairo-xlib-display.c
-+++ src/cairo-xlib-display.c
-@@ -353,11 +353,7 @@
-     /* Prior to Render 0.10, there is no protocol support for gradients and
-      * we call function stubs instead, which would silently consume the drawing.
-      */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
-     display->buggy_gradients = TRUE;
--#else
--    display->buggy_gradients = FALSE;
--#endif
-     display->buggy_pad_reflect = FALSE;
-     display->buggy_repeat = FALSE;
- 
diff --git a/x11-libs/cairo/files/cairo-1.10.0-install-sh.patch b/x11-libs/cairo/files/cairo-1.10.0-install-sh.patch
deleted file mode 100644
index b654fd10eede..000000000000
--- a/x11-libs/cairo/files/cairo-1.10.0-install-sh.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig	2010-09-09 11:23:11.298237207 -0600
-+++ configure.ac	2010-09-09 11:21:38.149557655 -0600
-@@ -3,12 +3,12 @@
- AC_INIT([cairo],
- 	[cairo_version_major.cairo_version_minor.cairo_version_micro],
- 	[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
-+AC_CONFIG_AUX_DIR(build)
-+AC_CONFIG_MACRO_DIR(build)
- AC_GNU_SOURCE
- AC_USE_SYSTEM_EXTENSIONS
- AC_CONFIG_SRCDIR(src/cairo.h)
- AC_CONFIG_HEADERS(config.h)
--AC_CONFIG_AUX_DIR(build)
--AC_CONFIG_MACRO_DIR(build)
- AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
diff --git a/x11-libs/cairo/files/cairo-1.8.8-libpng14.patch b/x11-libs/cairo/files/cairo-1.8.8-libpng14.patch
deleted file mode 100644
index 7756791f8dff..000000000000
--- a/x11-libs/cairo/files/cairo-1.8.8-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=305117
-
---- configure.ac
-+++ configure.ac
-@@ -161,7 +161,7 @@
-   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-   if test "x$png_REQUIRES" = x; then
-     # libpng13 is GnuWin32's libpng-1.2.8 :-(
--    for l in libpng12 libpng13 libpng10 ; do
-+    for l in libpng14 libpng12 libpng13 libpng10 ; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes