From fcf834224b9bad339659724b8973ff251ceb7c33 Mon Sep 17 00:00:00 2001
From: Tim Harder <radhermit@gentoo.org>
Date: Tue, 15 Nov 2011 20:54:36 +0000
Subject: [PATCH] Update to EAPI 4, use correct python shebang, and fix test
 deps.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64
---
 app-text/mftrace/ChangeLog             |  5 ++++-
 app-text/mftrace/Manifest              | 20 ++++++++++----------
 app-text/mftrace/mftrace-1.2.17.ebuild | 22 ++++++++++++----------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/app-text/mftrace/ChangeLog b/app-text/mftrace/ChangeLog
index 75abc8223254..a6fcfb312942 100644
--- a/app-text/mftrace/ChangeLog
+++ b/app-text/mftrace/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/mftrace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/ChangeLog,v 1.58 2011/08/22 09:39:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/ChangeLog,v 1.59 2011/11/15 20:54:36 radhermit Exp $
+
+  15 Nov 2011; Tim Harder <radhermit@gentoo.org> mftrace-1.2.17.ebuild:
+  Update to EAPI 4, use correct python shebang, and fix test deps.
 
 *mftrace-1.2.17 (22 Aug 2011)
 
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
index a35fbee38edb..385912e1643a 100644
--- a/app-text/mftrace/Manifest
+++ b/app-text/mftrace/Manifest
@@ -8,17 +8,17 @@ DIST mftrace-1.2.17.tar.gz 78967 RMD160 9e6a0797a9986733faadbacb9f80c190a8ef19d3
 EBUILD mftrace-1.2.13-r1.ebuild 1239 RMD160 9349bc97785b0b378a63d3cdd2912842cfac376b SHA1 429a64c60277c29ce536075e677e1544b737f859 SHA256 9a54a0fce3c8e5bb9690ae428a812c5f3786a84a2f4d8c90029b132cd847aa8e
 EBUILD mftrace-1.2.13.ebuild 1083 RMD160 f027c9aedfd2bdb92318ce03c90fee518bc9a2c4 SHA1 c07388bc9bf32c97f0b702839a78c541f2c8753b SHA256 3a9b20d1eda9703f09216f74a8fc267f764850f530b04fb5f302751a1e71bcff
 EBUILD mftrace-1.2.16.ebuild 1167 RMD160 cfd32e03a285a06a5d77015733b8a03c77fab1da SHA1 e7c1ec51db40eff0c591673add0143944a6ddfa1 SHA256 76e8342416ce66c79e27c04e0c09b08b9ae367f6e9c99fbdd156cabc3f853fdb
-EBUILD mftrace-1.2.17.ebuild 1173 RMD160 7bcfe99a8b3a68ba761a3b2531baae5be85dcb7a SHA1 7ab00bfebde4e643a3d40e0c1e38523027b5866e SHA256 579e211884343e479e2edf12d645f11522043f7762d830a08bd6ebc4f9e4aa4d
-MISC ChangeLog 7878 RMD160 ddfd286f9eaeb90decf4826fac1e5074bd737495 SHA1 47e44294aaa7f1f418d01abd720e3bf34988add6 SHA256 6f8e8c48e4ae92187f43b8ef3c89e16cb5fc49368607d7155e3de01d1dce7321
+EBUILD mftrace-1.2.17.ebuild 1187 RMD160 3c4eea664becfce816ef5c97b1149aa2f61fd155 SHA1 9b4fc6192abd802355bc6e58495d0814ce99b6dd SHA256 42fb9c0b8ddd667f9279680b1ba2f84f19014f7f942ceac27d513f1e1789f96d
+MISC ChangeLog 8018 RMD160 3703306735a2303a8e2faf8ec9567fa3b9bcbd6d SHA1 7cbcfc0104e0602f0150aa7e96c25740916471c2 SHA256 d0a5735f541d154e704a87a975d2c05637f3fce1177309c70b9ca3ef394bf84c
 MISC metadata.xml 175 RMD160 997eb58c486cff1d4ff125aafb9995b1fca89642 SHA1 15cba277c38077e1a85a4993076bccd68c3b40df SHA256 2007107c3c8aeddf4319c25e1692a4b36b149dbfe0e01037719838d244fc3327
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOUiPFAAoJEEqz6FtPBkyjdYAH/RAFv60QNmQVt+YHZiD2Kkih
-CvA1MkqjWSlA/syBzR9OrtQxZLQKN8MmZuPX7n0M8LnR2bWRN7Kctjr50N6jFoaU
-PunBn5XNmEXeIOq/49qASle6RMalvzJYUBkwXVtJLHaxjSCTXgCd4vY9pvJqee+5
-q6ozQFtosuqdV9sYIBG2itg2eUfbuYZOjoycL1lwacwRNbKXg73GhPystzTP3ir4
-92VAVWg5kjTRhtZQrmzoYMBYOuabF4OZ+8zmOprA2s+w5UJql5/6sb/gQPOrGCEf
-Vp1EdoXjWrgVFdyNwVRtaAsPqxuBs4W/tVuuGj9fbj+atTNrmrLSHjLkHmknAg0=
-=Cjkq
+iQEcBAEBCgAGBQJOwtGYAAoJEEqz6FtPBkyj7R0H/iKroUoj/nvr5RtlnxfchraH
+jmBerw6MurC385D7iVHWr1RKFmfei5wuDfVYE6kg77bhC8ErLEvw5GuhKAu+cvVV
+5zHISdPkAkQMVoaza6fbNX47z62L28Owdxt0vkp/lNdDcHZvc1ME16xTo0n8VBvD
+PBMLiCGsgskI9plO7e/CET0VsyrXOnkB8Iw8YFDUU+jkql3vIqnQ7mcsFV+ywQCG
+j0t4SpDsAnZbYisaLBFNYBan4upMc3m2oFk9JZWzdRYHc8+TjhwedEOf3AgVdT6a
+oYs//Uvhzf/bBKVShHaGXjLZuxWn1cJ/qiJP3V5kY5AMBhW6igXpzD35aH+qC1I=
+=5UjC
 -----END PGP SIGNATURE-----
diff --git a/app-text/mftrace/mftrace-1.2.17.ebuild b/app-text/mftrace/mftrace-1.2.17.ebuild
index 3f3c2ce48822..2f6050c99666 100644
--- a/app-text/mftrace/mftrace-1.2.17.ebuild
+++ b/app-text/mftrace/mftrace-1.2.17.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.17.ebuild,v 1.1 2011/08/22 09:39:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.17.ebuild,v 1.2 2011/11/15 20:54:36 radhermit Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 
-inherit python multilib toolchain-funcs
+inherit python toolchain-funcs
 
 DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
 HOMEPAGE="http://lilypond.org/mftrace/"
@@ -14,29 +14,31 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 # SLOT 1 was used in pktrace ebuild
 SLOT="1"
-IUSE="truetype"
+IUSE="test truetype"
 
-DEPEND="|| ( media-gfx/potrace >=media-gfx/autotrace-0.30 )"
-RDEPEND="${DEPEND}
-	virtual/latex-base
+RDEPEND="virtual/latex-base
 	>=app-text/t1utils-1.25
 	truetype? ( media-gfx/fontforge )"
+DEPEND="${RDEPEND}
+	|| ( media-gfx/potrace >=media-gfx/autotrace-0.30 )
+	test? ( media-gfx/fontforge )"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_configure() {
 	tc-export CC
-	econf --datadir=$(python_get_sitedir)
+	econf --datadir=$(python_get_sitedir) PYTHON="$(PYTHON)"
 }
 
 src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS}" || die "emake failed"
+	emake CFLAGS="-Wall ${CFLAGS}"
 }
 
 src_install () {
-	emake DESTDIR="${D}" PYC_MODULES="" install || die "make install failed"
+	emake DESTDIR="${D}" PYC_MODULES="" install
 	dodoc README.txt ChangeLog
 }
 
-- 
2.26.2