Migrate to EAPI 2. Fixes bug #261600.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

3 files changed, 22 insertions, 31 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/Manifest b/media-libs/fontconfig/Manifest
index e4895c42797f..dd5ba107e07c 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -9,13 +9,13 @@ DIST fontconfig-2.5.0.tar.gz 1385058 RMD160 2c61ba3adc49aa5dd4eb081e13a849cc1d62
 DIST fontconfig-2.6.0.tar.gz 1403857 RMD160 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf SHA1 93752566b8327485b153bd156049614f779b4c57 SHA256 a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
 EBUILD fontconfig-2.4.2.ebuild 2414 RMD160 4c7488d70c9e4380ae73525e7f15a122de85f2b5 SHA1 479f03bcf14b76e10e67950a5925991f00494388 SHA256 e0274d8c6fb723b4f0bc39e2e6596c4b61b8c6d15f0a79ab160d4945c0ac3ee0
 EBUILD fontconfig-2.5.0-r1.ebuild 2505 RMD160 e65b8588e50e6f56ddaebbe9e75f0600e18e98a9 SHA1 55f256b214f5d2bef1d78ef61a747d61b6f77266 SHA256 2b6ecdb834a51f4ef21dd265127e82eb60474edc1dc83dceec4f1c987b64c5b5
-EBUILD fontconfig-2.6.0-r2.ebuild 3425 RMD160 81d07aa8c5572dd084bb518fd3590557ed0f15c8 SHA1 9242d64a46c7f77f4866fc6334725651d1840c93 SHA256 258346b7df914cb8f497348e229116005e99b58e8b9255081c825816e963d7b4
-MISC ChangeLog 20624 RMD160 d7ab2d645d95fd43d7d56fa64b949f2bffa25be0 SHA1 cefea37ca99e21a5335c22c8398261fd4dfe4db4 SHA256 f5984a5b9e169bc07e7f146374e21ee34ad4181ea5e9c66e1cfa89d3281c1727
+EBUILD fontconfig-2.6.0-r2.ebuild 3072 RMD160 ff75040246af7d5c8c3a2db06f3689f618b5d2ba SHA1 355eb651ef6f2bdbaf124bbd48d3f189dbe0c93e SHA256 e87ec59e7f72a8d4627f36c273c2275c6a5819e3cd242ab37c56f1b26d5cb5c7
+MISC ChangeLog 20750 RMD160 d67818d3e55d54a41224b47c679f4d73f7c1cad9 SHA1 bd98692fd33cf9e40298f9144d67fe9de9400805 SHA256 ba974375248f9e6aa101d24024c9ebc0696e9eaab11a534794ab8007cb3f42db
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkk7uIQACgkQ67wieSYcaxeIyQCfWhbiAQNVjVWV8c0H2iy8r//U
-cjkAnjZArW41chHhw9B0mc1zNA5zGP4C
-=B2jj
+iEYEARECAAYFAkmyxxQACgkQcxLzpIGCsLS/3gCfZ+yoKHM3FjMBME3FAYCpKXQQ
+fg4Anj7QOqB8v6IY0WmvtojUfkuznlIb
+=6Ubk
 -----END PGP SIGNATURE-----
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 ...