--- /usr/portage/media-libs/freetype/freetype-2.4.11-r2.ebuild	2013-05-04 09:31:21.000000000 +0200
+++ freetype-2.4.12.ebuild	2013-05-15 11:34:34.960691924 +0200
@@ -11,12 +11,12 @@
 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 )
 	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )
-	infinality? ( http://dev.gentoo.org/~polynomial-c/${P}-infinality-patches.tar.xz )"
+	infinality? ( http://dev.gentoo.org/~polynomial-c/${PN}-2.4.11-infinality-patches.tar.xz )"
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="X auto-hinter bindist bzip2 debug doc fontforge infinality static-libs utils"
+IUSE="X auto-hinter bindist bzip2 cff debug doc fontforge infinality static-libs utils"
 
 # Note: replace emul-linux dep when bzip2 becomes multilib-aware
 # (and all [${MULTILIB_USEDEP}] on it then!)
@@ -54,13 +54,15 @@
 		enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
 	fi
 
+	if use cff; then
+		epatch ${FILESDIR}/freetype-2.4.12-set-cff-hinting-as-default.patch
+	fi
+
 	if use debug; then
 		enable_option FT_DEBUG_LEVEL_TRACE
 		enable_option FT_DEBUG_MEMORY
 	fi
 
-	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
-
 	if use infinality; then
 		epatch "${WORKDIR}"/patches/freetype-enable-subpixel-hinting-infinality.patch
 		epatch "${WORKDIR}"/patches/freetype-entire-infinality-patchset.patch
@@ -72,9 +74,7 @@
 
 	epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
 
-	epatch "${FILESDIR}"/${P}-auto-hinter_compile_fix.patch # 453956
-	epatch "${FILESDIR}"/${P}-locale.patch # 454804
-	epatch "${FILESDIR}"/${P}-sizeof-types.patch # 459966
+	epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
 
 	if use utils; then
 		cd "${WORKDIR}/ft2demos-${PV}" || die