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

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

3 files changed, 30 insertions, 20 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/Manifest b/dev-tex/cjk-latex/Manifest
index e70b86e49fd9..d07304b8a477 100644
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@@ -5,13 +5,13 @@ AUX cjk-latex-4.8.2-kpathsea_version.patch 1211 RMD160 3d71f8db0053de3a017871644
 DIST cjk-4.8.2-doc.tar.gz 2243205 RMD160 291c6d57dbef52537e712aa9b4f6f0cfa41b8e67 SHA1 95690d4dd7a820e729bd125507db05c808ab4f37 SHA256 d4eb32896e9f0e69c6f8ae81fd9d0aa0257390eb1d2b028173625995bcb9c00c
 DIST cjk-4.8.2-fonts.zip 20384230 RMD160 0c1d363af352c48bf6f24067699a9559e208f517 SHA1 f1e7ae35757241af267d2a086bfec2d82b081925 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4
 DIST cjk-4.8.2.tar.gz 553425 RMD160 184a890fb360b0c2ddd8f45fbd50f1b34ca22c51 SHA1 0b288469a56e3e30e7aa8b559f2b710f9525836c SHA256 2108856bafbf6eb44b65500122ae540d863fb1e4196485682be4d88244f16dd6
-EBUILD cjk-latex-4.8.2.ebuild 3583 RMD160 5b8bb2a0399bf46bee5b0bd4b0980b7499fc9836 SHA1 704af92158cc1ad64d00024734112e4d6b8af454 SHA256 d4a7057b97136011c8d22dca226747ce3d6459bf5de6e2eb0ad9d4be1c52f0ba
-MISC ChangeLog 5081 RMD160 95119103049a8537c27283683506422549d799d6 SHA1 1bbfe0c577713886dd7f3d3713e040df9044ae95 SHA256 b901f4e0c06c20d136415424ec49f5c918d7e521fdd558fea871be5833dec2ef
+EBUILD cjk-latex-4.8.2.ebuild 3596 RMD160 f46b73d8a0c84dfb3d3909399495261127dd75a1 SHA1 99bb044af68774e3de8aa32d96f509584afda79d SHA256 e5c6c13abd891fb521716387b597a69727e39ffdd6cf598bd12b890ed17d8695
+MISC ChangeLog 5227 RMD160 f48d7940c2e1912dd3e9c40b293d6814ea15bad9 SHA1 755ac19ed18b129cdaf3ddc14751938437ecab11 SHA256 97d306e35162fc87ed7eb880db27996126a0ea96f6dfb27841f5847e1522f143
 MISC metadata.xml 173 RMD160 2a5c18ac36394027f647f337410df755f5d37369 SHA1 98f3803fec9ccaf2574571b904292027095f5273 SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyx7PAACgkQvFcC4BYPU0oj5wCfTvwZuFtjin0gohMfOCffxak2
-3h4AoMcnFoMhwDuKb5gTktIlVInFWbIR
-=JkOn
+iEYEARECAAYFAk4J9doACgkQvFcC4BYPU0rxWgCeP6+JQ1RkRRrWzszfdSfkEcfv
+fQcAoKmj8k+koYD89ZXD2kPI/IPKQdhO
+=tWPw
 -----END PGP SIGNATURE-----
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"