Migrate to EAPI 2. Fixes bug #261600.

(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)

2 files changed, 16 insertions, 25 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 76f6a6b2e9c1..3738b2757046 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/fontconfig
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.131 2008/12/05 22:54:49 loki_val Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.132 2009/03/07 19:10:43 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
+  fontconfig-2.6.0-r2.ebuild:
+  Migrate to EAPI 2. Fixes bug #261600.
 
   05 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
   fontconfig-2.6.0-r2.ebuild:
diff --git a/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
index 51dde98dfb35..30262625ff1a 100644
--- a/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.13 2008/12/07 11:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.14 2009/03/07 19:10:43 betelgeuse Exp $
 
+EAPI="2"
 WANT_AUTOMAKE=1.9
 
 inherit eutils autotools libtool toolchain-funcs flag-o-matic
@@ -26,25 +27,13 @@ RDEPEND=">=media-libs/freetype-2.2.1
 	>=dev-libs/expat-1.95.3"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? (	app-text/docbook-sgml-utils
-		=app-text/docbook-sgml-dtd-3.1*	)"
+	doc? (
+		app-text/docbook-sgml-utils[jadetex]
+		=app-text/docbook-sgml-dtd-3.1*
+	)"
 PDEPEND="app-admin/eselect-fontconfig"
 
-pkg_setup() {
-	#To get docbook2pdf
-	if use doc && !	{	built_with_use --missing false app-text/docbook-sgml-utils jadetex \
-				|| \
-				built_with_use --missing false app-text/docbook-sgml-utils tetex;
-			}
-	then
-		die "For this package to be built with the doc use flag, app-text/docbook-sgml-utils must be built with the jadetex use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epunt_cxx #74077
 	epatch "${FILESDIR}"/${P}-parallel.patch
 	# Neeeded to get a sane .so versionning on fbsd, please dont drop
@@ -54,7 +43,7 @@ src_unpack() {
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	if tc-is-cross-compiler; then
 		myconf="--with-arch=${ARCH}"
@@ -67,8 +56,6 @@ src_compile() {
 		--with-default-fonts=/usr/share/fonts \
 		--with-add-fonts=/usr/local/share/fonts \
 		${myconf} || die
-
-	emake || die
 }
 
 src_install() {
@@ -92,7 +79,7 @@ src_install() {
 		dodoc doc/fontconfig-devel.{txt,pdf}
 	fi
 
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS ChangeLog README || die
 
 	# Changes should be made to /etc/fonts/local.conf, and as we had
 	# too much problems with broken fonts.conf, we force update it ...