set TEXMFCNF so that texmf.cnf is found by kpathsea, bump to eapi3

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

2 files changed, 24 insertions, 14 deletions

diff --git a/dev-tex/cjk-latex/ChangeLog b/dev-tex/cjk-latex/ChangeLog
index 8118b84882e7..9ac831657cd1 100644
--- a/dev-tex/cjk-latex/ChangeLog
+++ b/dev-tex/cjk-latex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tex/cjk-latex
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.44 2010/10/10 16:42:18 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.45 2011/06/28 15:40:04 aballier Exp $
+
+  28 Jun 2011; Alexis Ballier <aballier@gentoo.org> cjk-latex-4.8.2.ebuild:
+  set TEXMFCNF so that texmf.cnf is found by kpathsea, bump to eapi3
 
   10 Oct 2010; Alexis Ballier <aballier@gentoo.org> cjk-latex-4.8.2.ebuild,
   +files/cjk-latex-4.8.2-kpathsea_version.patch:
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
index ac0cee2c2a99..2f4199a78ab9 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild,v 1.8 2010/10/10 16:42:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild,v 1.9 2011/06/28 15:40:04 aballier Exp $
+
+EAPI=3
 
 inherit latex-package elisp-common toolchain-funcs multilib eutils autotools
 
@@ -25,10 +27,7 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	for i in "${WORKDIR}"/CJK/*.tar.gz; do
 		tar -xzf ${i} || die "failed to unpack $i"
 	done
@@ -41,24 +40,32 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
-	tc-export CC
+src_configure() {
 	cd utils
 	for d in *conv; do
 		cd $d
 		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
 		echo "all: $f" >> Makefile
-		emake || die || die "building $f failed"
 		if [ $d = CEFconv ] ; then
 			echo "all: cef5conv cefsconv" >> Makefile
-			emake || die "building $d failed"
 		fi
 		cd -
 	done
 	cd hbf2gf
 	econf --with-kpathsea-lib=/usr/$(get_libdir) \
 		--with-kpathsea-include=/usr/include/kpathsea
-	emake || die "building hbf2gf failed!"
+}
+
+src_compile() {
+	tc-export CC
+	cd utils
+	for d in *conv; do
+		cd $d
+		emake || die
+		cd -
+	done
+	cd hbf2gf
+	emake || die
 	cd -
 
 	if use emacs ; then
@@ -73,7 +80,7 @@ src_compile() {
 	cd "${T}"
 
 	for f in "${S}"/texmf/hbf2gf/*.cfg ; do
-		env HBF_TARGET="${S}/texmf/fonts" "${S}/utils/hbf2gf/hbf2gf" $f || die
+	env TEXMFCNF="${EPREFIX}/etc/texmf/web2c" HBF_TARGET="${S}/texmf/fonts" "${S}/utils/hbf2gf/hbf2gf" $f || die
 	done
 
 	einfo "Generating pk fonts"