--- vflib-3.6.14.ebuild.orig	2010-03-05 19:03:16.000000000 +0100
+++ vflib-3.6.14.ebuild	2010-03-05 20:07:10.000000000 +0100
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-3.6.14.ebuild,v 1.6 2008/09/02 23:45:55 aballier Exp $
 
+EAPI="2"
+
 inherit libtool eutils
 
 MY_P=VFlib3-${PV}
@@ -19,7 +21,7 @@
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXext
-	=media-libs/freetype-1*
+	media-libs/freetype:1
 	virtual/tex-base
 	media-libs/t1lib"
 DEPEND="${RDEPEND}
@@ -28,19 +30,15 @@
 
 S="${WORKDIR}"/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	sed -i -e "s:<varargs.h>:<stdarg.h>:" src/vfldisol.c \
+		-e "s:T1_Get_no_fonts:T1_GetNoFonts:" src/drv_t1.c || die
 	epatch "${FILESDIR}"/${P}-install-info.diff
+
 	elibtoolize
 }
 
-src_compile() {
-	sed -i -e "s:<varargs.h>:<stdarg.h>:" src/vfldisol.c
-	if has_version '>=media-libs/t1lib-5' ; then
-		sed -i -e "s:T1_Get_no_fonts:T1_GetNoFonts:" src/drv_t1.c
-	fi
-
+src_configure() {
 	econf \
 		--with-kpathsea \
 		--with-kpathsea-include=/usr/include \
@@ -51,8 +49,10 @@
 		--with-t1lib \
 		--with-t1lib-includedir=/usr/include \
 		--with-t1lib-libdir=/usr/$(get_libdir) || die
+}
 
-	emake -j1 \
+src_compile() {
+	emake \
 		CDEBUGFLAGS="${CFLAGS}" \
 		CXXDEBUGFLAGS="${CXXFLAGS}" || die
 }
@@ -62,5 +62,6 @@
 		runtimedir="${D}"/usr/share/VFlib/${PV} \
 		runtimesitedir="${D}"/usr/share/VFlib/site || die
 
-	dodoc CHANGES COPYING* DISTRIB.txt INSTALL README*
+	dodoc ANNOUNCE* CHANGES DISTRIB.txt || die
+	dohtml doc/*.html || die
 }