--- /usr/portage/media-libs/freetype/freetype-2.4.11.ebuild	2013-01-28 13:31:19.000000000 +0100
+++ freetype-2.4.11.ebuild	2013-02-02 20:26:30.931929214 +0100
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11.ebuild,v 1.9 2013/01/28 12:21:52 pinkbyte Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit eutils flag-o-matic libtool multilib
+inherit autotools-multilib flag-o-matic multilib
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="http://www.freetype.org/"
@@ -24,7 +24,8 @@ DEPEND="sys-libs/zlib
 		  x11-libs/libXau
 		  x11-libs/libXdmcp )"
 RDEPEND="${DEPEND}
-	infinality? ( media-libs/fontconfig-infinality )"
+	infinality? ( media-libs/fontconfig-infinality )
+	!<app-emulation/emul-linux-x86-xlibs-20121202-r1"
 
 src_prepare() {
 	enable_option() {
@@ -70,6 +71,10 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-auto-hinter_compile_fix.patch # 453956
 
+	# for our variable use, includedir needs to go after libdir
+	# so swap the two lines
+	sed -i -n -e '/@includedir@/{x;n;p;x};p' builds/unix/freetype-config.in || die
+
 	if use utils; then
 		cd "${WORKDIR}/ft2demos-${PV}"
 		sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile || die
@@ -79,8 +84,7 @@ src_prepare() {
 		fi
 	fi
 
-	elibtoolize
-	epunt_cxx
+	autotools-utils_src_prepare
 }
 
 src_configure() {
@@ -92,13 +96,18 @@ src_configure() {
 		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
 			"${S}"/builds/unix/configure
 
-	econf \
-		$(use_enable static-libs static) \
+
+	local myeconfargs=(
+		# expanded by make
+		--includedir='${libdir}/freetype2/include'
 		$(use_with bzip2)
+	)
+
+	autotools-multilib_src_configure
 }
 
 src_compile() {
-	emake
+	autotools-multilib_src_compile
 
 	if use utils; then
 		einfo "Building utils"
@@ -109,7 +118,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	autotools-multilib_src_install
 
 	if use utils; then
 		einfo "Installing utils"
@@ -130,11 +139,6 @@ src_install() {
 		done
 	fi
 
-	prune_libtool_files
-
-	dodoc ChangeLog README
 	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO}
-
 	use doc && dohtml -r docs/*
-
 }