Fix character code issue with Texinfo files, bug 438456.

Package-Manager: portage-2.1.11.27/cvs/Linux x86_64
Manifest-Sign-Key: 0x7DC6EA25

3 files changed, 29 insertions, 14 deletions

diff --git a/app-emacs/yatex/ChangeLog b/app-emacs/yatex/ChangeLog
index fedbe8827dd0..4797ba666816 100644
--- a/app-emacs/yatex/ChangeLog
+++ b/app-emacs/yatex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/yatex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/ChangeLog,v 1.37 2012/10/14 18:50:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/ChangeLog,v 1.38 2012/10/15 21:46:04 ulm Exp $
+
+  15 Oct 2012; Ulrich Müller <ulm@gentoo.org> yatex-1.76.ebuild:
+  Fix character code issue with Texinfo files, bug 438456.
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> yatex-1.74.ebuild,
   yatex-1.76.ebuild:
diff --git a/app-emacs/yatex/Manifest b/app-emacs/yatex/Manifest
index 68d810114413..c474753b878d 100644
--- a/app-emacs/yatex/Manifest
+++ b/app-emacs/yatex/Manifest
@@ -8,13 +8,23 @@ AUX yatex-1.76-gentoo.patch 668 SHA256 86fe6153f9a14896b3da54211d5da54753bee5b8f
 DIST yatex1.74.tar.gz 346740 SHA256 8a3a5eab52244e4519f44142dcd7819a628bfbd37582a808a590b0aac55968e5 SHA512 04741eaa1727d44c1d52f10cd346390d1cb03a425fc1538d89486606c41e330a8f23f190e2f5d2133070085aec7df5c55d142c76b55491e85baccce29af03131 WHIRLPOOL b05f02e5451301bb1089c35a6d99d3d987dab280d772649455044a683dab14b4b0bb87e058ac314eac55fc1a76561ac62ae1dadc69d300e87712dfead0202cae
 DIST yatex1.76.tar.gz 357552 SHA256 66c6f162a0ce4ee1edb231bacb4a3926ea4b5a45a4ba004330bb0bc0a7887acf SHA512 ff2afea1cb1b7e4bef223c13d4cc6b942b1d555959321e7cb97595dfe7ca3adbc9efa6db7d7d13cdd0bb5aa62eabc1d3383d07635b1dbbe5b15175bf99c4c416 WHIRLPOOL 878b199d1479a501fb36763daf6565ddfe340df2b607e346c8b4e5523c20df2cefe4a7254dd2a3f415fc4b2bc0371b79f9c504d801d3e4cc8553091bd2b4cd36
 EBUILD yatex-1.74.ebuild 1326 SHA256 7ebbef697f34fe62376b527477342443150efa001966803653856657db20e98c SHA512 a7f556a0908ad9b921943051d8433a20333d39cc6dd8d6ee1d58c442a1be235b4bba68edd3d038cedce7b11cf9bbb45f7ba6ce812d25591fb9d31296164e226e WHIRLPOOL d8536a228edccd899a06743b1482cc014fea08f281370d8dfec85150d98d1e6b68aca8cd8ddb2bf0c24c67bc6d76ad494d3ce0f1c26b06dabb0b534fb08ec9e4
-EBUILD yatex-1.76.ebuild 1308 SHA256 2e1fb70afd06838343498cf456f83d1c01ef5cfa08ba4732732d4de28334e3ca SHA512 7f50afae7badd9858cffbdb7d0bd301dc2fee72ff17136de42cb6ad476648dd341d014eaa0d1aab2740445191345334be00f0d3c639f89847db2f4b91fdee879 WHIRLPOOL a74a2f4c0c252719f6c7aef01b0d4bcf2b02db75d73536997cba22ffb5d71115299845f04f3ee9286fabe31e23000cbbefdfbecba55331546d1f3aa78aeca427
-MISC ChangeLog 4745 SHA256 9e003cac6c236210df15b61d1709dc267a6917ebe1aa6503782bfc7129763187 SHA512 c3525ea2089d0c51ff28179b03560c9a5a987e06212d6eca565e3e07e769d7b2873ac305655134fc8f3316d3346489c5e6a0d9237868a86d2e1f14fbb3c996f6 WHIRLPOOL ba19c231c19d90af9263636cfca3737aa7054b031baafe3e4d5a300c90b01d86e60f0041fe5337402797c0e24d1ff9dfda14b2f8b8d9a2a7307d9bd5f458ad21
+EBUILD yatex-1.76.ebuild 1331 SHA256 0f8c0bf661f352f7e12ac03c9eab87cbb20155a2dd2344116492affe7ac422eb SHA512 41b2eba57d19fa5dde08e34d9da235996a717c81ecf96159908514a70be346253d33335755cd25913cc9479ef91ecc2b398c9bf243c9e2b8c520273e9d9bccae WHIRLPOOL 257205da508533c32de2793319680e8352c342408d71b773c33ce9436c3345512e585c38ea582b3c89012e7da2051a0d8cca123bde4e884c41bac6281b63f60c
+MISC ChangeLog 4867 SHA256 e695a40f14f7c0e5f216b002b4a60f9277480214c7c1bee5e535a34b8a0adf65 SHA512 73d3da4edaca89152ab6e58f48e95a11a5006d272b52920a9188322afc0e157752fb54edbf576a29e06f29b3fdd8ea4ee2706fea879c6f328fb0d4f5ea06da9f WHIRLPOOL 372946823ccf1f222b91ca527b66907d9b1bdf2bc7754b691abd94d7ff7b72af2711cb20139ce40d82de9fedfc69ec58f19cfb5b0d29c3f1903739db668a74c9
 MISC metadata.xml 575 SHA256 e63f63c75b64c0cc80e80838c036ad50858c768fd1c7dd7fbb1a44be27e64eed SHA512 1146ea2f3b777108df947a7ecc848ee3b027ed49ad68e3b17d8f272065df6a0a8a9c543be007c2c254822f9d253c61e72ce04825c0488fb7a78652ff8e872563 WHIRLPOOL 0b6e7f74eb6eaa8cb27849f47095b233103dec9efb1d7430566279b9b897d4d151fd9001db989276897d56222a7f88ea6e0c6e3e0a9939feb256aa7ef6412e2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB7CYEACgkQuQc30/atMkB9jgCeOw2LypmrtGtPauBLRG2N+eXH
-kBIAnRkUIygVrn7AqlZc78V1svkxRbDD
-=0AHg
+iQIcBAEBCAAGBQJQfIZZAAoJEDxpGckxwJCB358P/igNoLuBUEv9XBc9n+lbzUMP
+h9cDUUWxiaEEd4KCW6T2YMIK6Mcnyfn2jIYfVw3Au2D96WGvS2TNZjBNP1GX76wH
+6pCb4W1i0CDpWdnURXw5Bij0DbMZMM/sncPprjQ2MHc9YPTYs0EsygM6Z3BbKxvL
+aG9Xu/af5hTzVT8NrpujWJiFQi09wNIS83sDdPW5VoQvoYjajKhT9mQ/blHo0DQS
+DJhXybon5vD/2pbSoKosJt55Uw6pr8FJuRypQKx52ntcagBufSsXS/Wd0k0fnZ8l
+flgETyUCUNGPCOf3XvlDP1FiUTp3cVqcKqQMVDbrXMh893PGpKT0XGUoiHmNzd//
+1nCai+o3XXcajrOXX1HLlX3ACzmtCnqnmPjE5SveJ9ZhYp2S6PFSTlBYMsMHQGnU
+raw4pyiT2ebsQUAhTqeWrohOMxVE5vWoEfaeJJjfCdQzfhzuklmc6NbSl6hwUria
+TZXAxR5p6G6/7n/fDa6EiNwJBuqOv4A3HSVyWhrnTUAwXQtdsOfTHynTvXPctwHK
+IW4ZAUE6aHLTFu5htoNymzvXHyINjppKHGQqSU/vOD4//sJtYEbql+Vmn+l0nc4M
+QUzzR3bztLnf74UrzaJ0DabzDUfbTZputEg5NRlnF15AVMXo+IwPEY4dADwPr8XF
+TWm080gQSd3ZCpHdgHh4
+=DIDM
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/yatex/yatex-1.76.ebuild b/app-emacs/yatex/yatex-1.76.ebuild
index b37116b2e7d1..6479a32d3d98 100644
--- a/app-emacs/yatex/yatex-1.76.ebuild
+++ b/app-emacs/yatex/yatex-1.76.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.76.ebuild,v 1.10 2012/10/14 18:50:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.76.ebuild,v 1.11 2012/10/15 21:46:04 ulm Exp $
 
 EAPI=4
 
@@ -24,12 +24,14 @@ src_compile() {
 	# byte-compilation fails (as of 1.74): yatexlib.el requires fonts
 	# that are only available under X
 
-	local texi="yatexe.tex yahtmle.tex"
-	use linguas_ja && texi+=" yatexj.tex yahtmlj.tex"
-
 	cd docs
-	# makeinfo fails, so use Emacs to generate Info from Texinfo
-	${EMACS} ${EMACSFLAGS} -l texinfmt -f batch-texinfo-format ${texi} || die
+	makeinfo yatexe.tex yahtmle.tex || die
+
+	if use linguas_ja; then
+		iconv -f WINDOWS-31J -t UTF-8 yatexj.tex >yatex-ja.texi || die
+		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex >yahtml-ja.texi || die
+		makeinfo yatex-ja.texi yahtml-ja.texi || die
+	fi
 }
 
 src_install() {
@@ -38,12 +40,12 @@ src_install() {
 
 	insinto ${SITEETC}/${PN}
 	doins help/YATEXHLP.eng
-	doinfo docs/yatex.info docs/yahtml.info
+	doinfo docs/yatex.info* docs/yahtml.info*
 	dodoc docs/*.eng
 
 	if use linguas_ja; then
 		doins help/YATEXHLP.jp
-		doinfo docs/yatex-ja.info docs/yahtml-ja.info
+		doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
 		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
 	fi
 }