--- cairo-1.8.8.ebuild.orig	2010-02-20 11:31:47.563913367 +0100
+++ cairo-1.8.8.ebuild	2010-02-20 11:53:00.176781995 +0100
@@ -1,6 +1,6 @@
 # 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.17 2010/02/08 15:59:02 cardoe Exp $
+# $Header: $
 
 EAPI=2
 
@@ -13,13 +13,13 @@
 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"
+IUSE="aqua 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
+RDEPEND=">=media-libs/fontconfig-2.8.0-r1
+	>=media-libs/freetype-2.3.12-r1
 	sys-libs/zlib
 	media-libs/libpng
 	>=x11-libs/pixman-0.12.0
@@ -51,8 +51,8 @@
 	X? ( x11-proto/renderproto )"
 
 src_prepare() {
-	# ClearType-like patches applied by ArchLinux
-	use cleartype && epatch "${FILESDIR}"/cairo-1.2.4-lcd-cleartype-like.diff
+	# Use Freetype API for subpixel filtering (patch from Ubuntu)
+	epatch "${FILESDIR}"/${P}-lcd-filter-ubuntu.patch
 
 	epatch "${FILESDIR}"/${P}-interix.patch
 
@@ -95,5 +95,11 @@
 		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"
+		ewarn
 	fi
+
+	ewarn "Cairo now uses the Freetype 2 API for subpixel font filtering. To " 
+	ewarn "enable the filter previously applied by the cleartype USE flag run:"
+	ewarn
+	ewarn "\teselect fontconfig enable 11-lcdfilter-default.conf"
 }