Fix GNU Info files, bug 437612.

Package-Manager: portage-2.1.11.26/cvs/Linux x86_64

4 files changed, 93 insertions, 24 deletions

diff --git a/app-emacs/yatex/ChangeLog b/app-emacs/yatex/ChangeLog
index 652aeee15d9b..3b997713794b 100644
--- a/app-emacs/yatex/ChangeLog
+++ b/app-emacs/yatex/ChangeLog
@@ -1,9 +1,10 @@
 # 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.35 2012/10/11 16:31:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/ChangeLog,v 1.36 2012/10/11 18:59:14 ulm Exp $
 
-  11 Oct 2012; Ulrich Müller <ulm@gentoo.org> yatex-1.76.ebuild:
-  Fix installation of GNU Info files, bug 437612.
+  11 Oct 2012; Ulrich Müller <ulm@gentoo.org> yatex-1.76.ebuild,
+  +files/yatex-1.76-direntry.patch:
+  Fix GNU Info files, bug 437612. Drop ppc to unstable again.
 
   11 Oct 2012; Chema Alonso <nimiux@gentoo.org> yatex-1.76.ebuild:
   Missed the blocker bug (#437612) marking unstable for amd64
diff --git a/app-emacs/yatex/Manifest b/app-emacs/yatex/Manifest
index ef3007d75b2a..c4765f3bb7cd 100644
--- a/app-emacs/yatex/Manifest
+++ b/app-emacs/yatex/Manifest
@@ -3,27 +3,28 @@ Hash: SHA256
 
 AUX 50yatex-gentoo.el 488 SHA256 daf76513095da0d003c5a63f20c0648b66de5251607429bc4da8e951a066aaf9 SHA512 93a1d45bb228d1ac304fd3652246561a5b7a9d91aa230f0f0d62a9e557f9f61a1dafee900139b7588f3310fdb98fbd71d6347ee45b6527ae27e2095da2a652b5 WHIRLPOOL d141574fcd6dd533bdc21962ebec363597e985b4beba773ceaa1152dcfbc4765ec8daf1851278e8e5672ad0d239c712104a5da4d1f5d145801c0bad9a1c59253
 AUX yatex-1.73-gentoo.patch 2309 SHA256 b252cf493968e683b87328a63b7606c41c150736d244e92622730fd397cea491 SHA512 a9fd0c92f01dffcd9c28ab52ca690d5b060f05ba8e6d9464722c48b3f6c47871a9f3c52c369a61893d8f785db86339b275dcc36b9bad3069812e22fad107dac9 WHIRLPOOL 0f1343abb4f8a99d230d3b92464c2a6bac31b0f58c5f8895da0a2b8d0b793ca2e23055947de2a75c4e22bac859eae9c4002f579f9ccadb73e153e0528cfd2e60
+AUX yatex-1.76-direntry.patch 1730 SHA256 184375f82722ab43a03957ed356282ff67e2ded46979b42b383f5a6eb5ea319e SHA512 e7ddb8270e5ece483a5a796b7c5b712059b3093ec1994565400afa6731efe76494cb86163632edde3b3bd167cf78886c216482ab4377c9fd8a969b37a41aee6e WHIRLPOOL 54daaa4c4c3f4c3c08870a4f040b96799a0a92475c089a0c562aa521892dafd4b03188e7185dc886a1d076046d94cd0338f6870ac82769bd8223ac0b684df17d
 AUX yatex-1.76-gentoo.patch 668 SHA256 86fe6153f9a14896b3da54211d5da54753bee5b8f9e14080c05cd6003ba2678f SHA512 dc1bd4d95cec7eb9268560ba78c93a1551f28e0da83d9beb99313e034dfd86044f2971a2dc0ae830e975e78d0a79b951d02378c677eb4d39d5e7f6885e6377cd WHIRLPOOL 61303a21650b53b71a92f030f84ba839e7408319b1150ced3145ea152f4908f3ad519c52ee6d3d845eecb49c0b22ff5e552122cdd03a13fab22152719a60a95c
 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 1334 SHA256 88e55e1a86c483fab23e50db5338991c059d21cdc18b50dfb4cab08620e52b05 SHA512 9d945c38226ac2b699f7a0e8015d17781b7b019beff594741e5018af632fda7220c4e18cc28d41bb803f0487398500499c78578cabec2e014745009e9b3c0c98 WHIRLPOOL b0191519f7ff67790ba42d22aadbb9d3b6a51a7972031e44131f7ba811220eb1bf7f4e1f24b585966fcfc8e854beea02032985587ed0755792bc894a72d35105
-EBUILD yatex-1.76.ebuild 1034 SHA256 573f20be9b235e824eee07a4f6675be4a543e7998dcbc759364b12328800b2da SHA512 413112977c27f7aa3725d05dcd3d97d57584e6ecd1693628ace2e3cd0704dadf8a74cd08fb2f70a9d65111d7a5164895c20d3a4399828344218a68b2a4b0c7e6 WHIRLPOOL bb898940dff269110e3e0ee8f530cba29a3d12b540d67ff103f5c625789694f9b83bba151d5745ecedc5a3648b8515651523335750520ba7cc64b7f7c992c0c3
-MISC ChangeLog 4575 SHA256 e7c44f7ce2dcc472dc7a89341cc8321b4e0f784e0b54a8b21c9717a5f64eba02 SHA512 fedeaf3e0e3b5d47173d263bbe9d1569693b40c25478091891db8b5d06a2b3991fd053a4e35532b929a20cce25d7d66b6913404c931c7369fddca30c304e8061 WHIRLPOOL f73b704553f39d30d0ae042f11c32e2a4a5a75fddb16bb7948a93792f1207396fd5fbfab62984384a20e61dd5e3dd0f3fa2f9221d55c0d2353fc3d268dd1026a
+EBUILD yatex-1.76.ebuild 1317 SHA256 3b367ea0a6a9851ee1840d9837cff318755d843291de68e75b3c0738c062a0b6 SHA512 e8813122b0db2119516787640dd3932956cbf63ee7729473eda09491a2558c99d3e1513655112b785bdeeef9158d35eb6835be7db206ee98c31efae7a8212634 WHIRLPOOL a2a23e32045b392883b9468c9869fa164b4978f920734a0dbb883adfa66ac31bb28aedda953a472673bbaa79c0d9b2921d02e4ec97c5fab681922947a7a57fb1
+MISC ChangeLog 4623 SHA256 e3bc048d53fba12eb07b3cbb9caf558d93d02d671299eddf96859e02f7c051fb SHA512 75acd61f75e169ce3dcda2100b315d04b374e5ee02590834f6bd7acc052568e6eb2615cb7a7548c72274f6be7baeb20e9edc4a85ba22f7daec64683973304bc6 WHIRLPOOL 052977fd87af762c533668622918fb9014166df9a91c5cabf3f8cea3dd01c8f0f2b9665c901e88984e61b2cfd9af0ac549749af41beaa68cce388859edcae835
 MISC metadata.xml 575 SHA256 e63f63c75b64c0cc80e80838c036ad50858c768fd1c7dd7fbb1a44be27e64eed SHA512 1146ea2f3b777108df947a7ecc848ee3b027ed49ad68e3b17d8f272065df6a0a8a9c543be007c2c254822f9d253c61e72ce04825c0488fb7a78652ff8e872563 WHIRLPOOL 0b6e7f74eb6eaa8cb27849f47095b233103dec9efb1d7430566279b9b897d4d151fd9001db989276897d56222a7f88ea6e0c6e3e0a9939feb256aa7ef6412e2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQdvaNAAoJEDxpGckxwJCBbksP/3/sfDJC/tvbFwC5fCYYmQU8
-0awm74sH54z6PqbO0+Gmvk3yu6XkAGBlvhacOoFVNRvtpyrftIe+stM7fLguYpMX
-SYvtmEjBntAeoY5UooCEAuh+Z5CZzeGbD+1Hk9hPlmGndZToZqs9V41ztpbD6XrY
-BT4+sS2teFUVkzP9VBTIq0DouN433bcMMLGcfEzchq9d+xFWD9YhnOCZK345RpHz
-gjmW/e5aQDE55Mgn5cYRGAPJWjZFyR/ea7q074wh34pcrwexlIBqeGSKx7+njhAv
-tKDT5IxS/qnTKP0ZQDnSS867HfWjxueL4orHyR/tHJq/5HE7Rn/1KKxFH/AK2+CR
-wp6HrGC/FCYfT3sKjnJkfn1B45L6ycXIgv4SUEbe/pHdoqs+m8iwUn+c7sJUkv8k
-vVaewNou93S+H0SQhG3fWFJ52AUtAT8xEgPF+dNRYt2grekoXf7v74YfUA4/kTul
-CcIoKktpsfhfGiXVym3gehKjW0Co7oO0JIB9xfYKYiT7q8mDanHozm7YA5UuJo1V
-9ver4AGpIprQuuM5PzBD2wiy+YMe6+pciIgGQVLahvtwLpTuDotlMrQy1IWXfCEf
-2prKtncXL0IF8wFkMNbG71r9qJ0rF8rS1BElRkrK6irKvVa7szwxQBSLs/lc9Wov
-YFfkZMfZCC5zMnJDZn9x
-=1IuC
+iQIcBAEBCAAGBQJQdxk6AAoJEDxpGckxwJCBmnMP/0dMAaemWN91Fd6JTHIdYsXc
+sDpQFWc9NLLEX8PKQ4UWKWpa7Vh9WSDHqug9iKyWTKOTMmZI3q8gJ15+7xgahAFH
+l+tFfhYsRupMFMfW5G10Rp1ugmUnCvrMy/5LQ/lgL3yNimDGAF4+xkEtV+mTCeWk
+8ZOZAWEH/H1Npz21ZA76TENYDYnGAOltr8WpcWk2q6QqCTA9YMl8Pen1r5MOCgnr
+aN9lW3gcOcwE5Mc4wg7PAGUl45v1vlvocIcwEGOVueQPb4npo7Dd0ngORsSIb+Sf
+i6nh24DEDX2GsVWx8uNTugAo1bhXPxoDMPPaSr5JuIj/5+uBlkM9dPvcIdgRKMRR
+tce9dVpLN3t+etH3decWlbN55J+jla5Cw8dE7VhyUedE3NrvtEG4XQ6qzuGMr5zn
+1LBKcYXAxneJ/ZPEC0gzdlsCco8/8RsHL42Ie5bfCqBMv7IYZ+TENlOqH4dIVcZx
+z+qi4GAApzkyV+XLzgH0u9fzGgdIiQ57SVh2choo5A9Qvv2xSOOGZHwJwMTfT3v7
+yAg6Nhwdg3ABrb8CH2j4po6RdK1H8GFgr0FdihTKagaANmdzCESS7/nnoOKNszK+
+Ac2RR1pfwSkRXjkGN8+ZVO0ib3yoiHUBr+FuTQA08gwMulz8s9CXACLNJfFFAzcJ
+5wR8VOUUkX9QbkbfjrCo
+=g+9B
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/yatex/files/yatex-1.76-direntry.patch b/app-emacs/yatex/files/yatex-1.76-direntry.patch
new file mode 100644
index 000000000000..8dc0c5f310f7
--- /dev/null
+++ b/app-emacs/yatex/files/yatex-1.76-direntry.patch
@@ -0,0 +1,60 @@
+--- yatex1.76-orig/docs/yahtmle.tex
++++ yatex1.76/docs/yahtmle.tex
+@@ -1,9 +1,10 @@
+ \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+-@setfilename yahtmle
++@setfilename yahtml.info
+ @settitle Yet Another html-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* yahtml-e: (yahtmle).  Yet Another html-mode for Emacs (English).
++* yahtml: (yahtml).     Yet Another html-mode for Emacs (English).
+ @end direntry
+ 
+ @iftex
+--- yatex1.76-orig/docs/yahtmlj.tex
++++ yatex1.76/docs/yahtmlj.tex
+@@ -1,9 +1,10 @@
+ \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+-@setfilename yahtmlj
++@setfilename yahtml-ja.info
+ @settitle Yet Another html-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* yahtml: (yahtmlj).    Yet Another html-mode for Emacs (Japanese).
++* yahtml-ja: (yahtml-ja).       Yet Another html-mode for Emacs (Japanese).
+ @end direntry
+ 
+ @iftex
+--- yatex1.76-orig/docs/yatexe.tex
++++ yatex1.76/docs/yatexe.tex
+@@ -1,9 +1,10 @@
+ \def\lang{jp} % -*- texinfo -*-
+ \input texinfo.tex
+-@setfilename yatexe
++@setfilename yatex.info
+ @settitle Yet Another tex-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* YaTeX-e: (yatexe).    Yet Another tex-mode for Emacs (English).
++* YaTeX: (yatex).       Yet Another tex-mode for Emacs (English).
+ @end direntry
+ 
+ @iftex
+--- yatex1.76-orig/docs/yatexj.tex
++++ yatex1.76/docs/yatexj.tex
+@@ -1,9 +1,10 @@
+ \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+-@setfilename yatexj
++@setfilename yatex-ja.info
+ @settitle Yet Another tex-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* YaTeX: (yatexj).      Yet Another tex-mode for Emacs (Japanese).
++* YaTeX-ja: (yatex-ja). Yet Another tex-mode for Emacs (Japanese).
+ @end direntry
+ 
+ @iftex
diff --git a/app-emacs/yatex/yatex-1.76.ebuild b/app-emacs/yatex/yatex-1.76.ebuild
index 9e8403e5c1c5..b1cc6b72ccfd 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.8 2012/10/11 16:31:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.76.ebuild,v 1.9 2012/10/11 18:59:14 ulm Exp $
 
 EAPI=4
 
@@ -10,19 +10,26 @@ DESCRIPTION="Yet Another TeX mode for Emacs"
 HOMEPAGE="http://www.yatex.org/"
 SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="YaTeX"
 IUSE="linguas_ja"
 
 S="${WORKDIR}/${P/-/}"
-ELISP_PATCHES="${PN}-1.76-gentoo.patch"
+ELISP_PATCHES="${PN}-1.76-gentoo.patch
+	${PN}-1.76-direntry.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 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
 }
 
 src_install() {
@@ -31,12 +38,12 @@ src_install() {
 
 	insinto ${SITEETC}/${PN}
 	doins help/YATEXHLP.eng
-	doinfo docs/yatexe docs/yahtmle
+	doinfo docs/yatex.info docs/yahtml.info
 	dodoc docs/*.eng
 
 	if use linguas_ja; then
 		doins help/YATEXHLP.jp
-		doinfo docs/yatexj docs/yahtmlj
+		doinfo docs/yatex-ja.info docs/yahtml-ja.info
 		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
 	fi
 }