gentoo resync : 04.08.2018

9 files changed, 358 insertions, 105 deletions

diff --git a/app-emacs/yatex/Manifest b/app-emacs/yatex/Manifest
index 86ce28f2c5f9..57b1bac95bee 100644
--- a/app-emacs/yatex/Manifest
+++ b/app-emacs/yatex/Manifest
@@ -1,9 +1,10 @@
 AUX 50yatex-gentoo.el 488 BLAKE2B fcc7c76ee0ace31938ac6e7f438832d53542d2cdd0109ddf9ba59c8cdfe535f1bb5f2d2bf5edeb7247cc8903424f3eb5d4eeac56fe01f2d4665c85936a4736bd SHA512 93a1d45bb228d1ac304fd3652246561a5b7a9d91aa230f0f0d62a9e557f9f61a1dafee900139b7588f3310fdb98fbd71d6347ee45b6527ae27e2095da2a652b5
-AUX yatex-1.76-direntry.patch 1730 BLAKE2B e705e6f7b6a0bc7206aafe33af43f239be54b4203dc3e55e7f8221b3509f474c978165c62f8876633b7052247592ce4584beccce93cfe95b046cdedc48e527b5 SHA512 e7ddb8270e5ece483a5a796b7c5b712059b3093ec1994565400afa6731efe76494cb86163632edde3b3bd167cf78886c216482ab4377c9fd8a969b37a41aee6e
-AUX yatex-1.76-gentoo.patch 668 BLAKE2B 8ddfcc0d7f189462777ddd30ad77e4053230f701fc94448ad6ea0bc0096ba02c911e057b071278eb5c4e3b61151d16e247b4fd38c66b7314a2df82c342a00443 SHA512 dc1bd4d95cec7eb9268560ba78c93a1551f28e0da83d9beb99313e034dfd86044f2971a2dc0ae830e975e78d0a79b951d02378c677eb4d39d5e7f6885e6377cd
-AUX yatex-1.77-texinfo-5.patch 2968 BLAKE2B 834f913dfef0d56e12fe163cdee501fc681b6f33beef5f5757598a9c5703c36619ffaa13ad811dc29a36b5fbcb9c7fd2e797ce8ee07bfa2bd2ddf1df65c2242e SHA512 91b2caf1adcd805fa10d9c0b2576a83fb57f549d64e9ee37b6873cd705ebaecf96853efb265b3f7e42f821f37c79b469ca8507fd1d3470190e04594788b7d8ad
-DIST yatex1.76.tar.gz 357552 BLAKE2B c829cf73d38fd0ea12bd9b831059fabae2d8cf6d7f111762a409770910aefc6f0617979e38ef0fb5c489d92c38c83832cf74e075f68a190c794aa15b5f0a696b SHA512 ff2afea1cb1b7e4bef223c13d4cc6b942b1d555959321e7cb97595dfe7ca3adbc9efa6db7d7d13cdd0bb5aa62eabc1d3383d07635b1dbbe5b15175bf99c4c416
+AUX yatex-1.76-direntry.patch 1646 BLAKE2B 7b13a22accecada28782abac230b7e20aec5aa1e920d98cf9fd68e776a1527181ebe8d99a8d4eecf1415d30336b7021edd2e9cbc1934d7022a3251095dd74702 SHA512 4415c8ebc8e3bfb7f15ac842e05743d7689def9365fae75a466b05daa7356f51625348e1b68f4eb6ff0144eec12feecb0054562aa91414ba6a5ad544999ec42e
+AUX yatex-1.76-gentoo.patch 575 BLAKE2B ac5293869e9624e0f1e53787af07729dbc39191af465103a157c750becc33c7a4ce77605cd24ca2b1564eebc67cbc742544b4fa4b9697d245a0a8064246e13aa SHA512 79362e03f2b4fba1df96d9468bd3fad5fe98d36a8faaa4a4d74ae0eb4401081fd843e8de952498e0d3fd3ed53b0f434ca39f978baa246b24a1c375d82754b6e4
+AUX yatex-1.77-texinfo-5.patch 2884 BLAKE2B 89dc66fdc301ab4a205b8043741a8ac70db603666643515bfdceb93a5fe9ab323ee0e22f42d6521e2787af1be2619e098c43ea4891b32298943cf5308e426ba9 SHA512 e67405720765de50c012363fe77b61614927f6c13b4158cb08e7011fbbd74956eea271394f7bca1bd88419f1d3a52512e3946d466eb6f18b51bf94cd5e55a57b
+AUX yatex-1.80-texinfo-5.patch 8187 BLAKE2B 9039ff22af04b4f7bb7d7538eb73977aed30c14ad5329698691c30222b07c0cf2e531e85037bec790178c4003934ee082978ae37e7959bd5a76842659b1299b9 SHA512 856b16be069c6a77535b1800303b48467366d4765afa1d66ed5ccfc78c031b899ea027de8a95bb4687f19c06f9edb98d3e520e68adf2e93ca68acba96b62fbf8
 DIST yatex1.77.tar.gz 356721 BLAKE2B f923bc80ec32ee3d1654f15a99624251604c94af60738ad2f56b237d4385da0951bec32b32f297662540667da2648789a380b433332ce7e10f50f1d016c3b6d0 SHA512 d6b909b540b0966cfcd35a36ad7c9e8d8a821ca668ea9b0a4d1f3267a45397800769dd47ce64f5f8cbda65c274a7f415c8e86b6598a365ea41104684cf9df07f
-EBUILD yatex-1.76.ebuild 1213 BLAKE2B 4e707f3c0c9b17209ebc2546044de5b3ec7266d94227f4e5c06bc5fe1f5a00094af364f7133cb06228498b8cb9d3ba3bf1337c1c3a3e3865b46545e673fdf72b SHA512 bfbcf7cf87bb592e8ed9cdb0c17cc2bdaf31246412e145913e993553b1f7ba69fd24625e0941699abec2b5fdb4111cf548641a900f0d24d934df7ad460c14a86
-EBUILD yatex-1.77.ebuild 1241 BLAKE2B 005fadf3bba18e44aa6483f149ab29c5c643a94168f1a575ec5eed48e5dc948c36c8761317ad723cf367051577fe6bf1a58ac512973e5b1b13ca444a8d3d4fe2 SHA512 f935dd5ca28fb1c1eb6ed7eb4828ee08e2b17ed2c73c84986762f9befeab712f7b186c522a8400c4948899b258080230d802722c6934582eb85952d351d4fdac
-MISC metadata.xml 775 BLAKE2B 1bbb59c7ea19bb7527aa04a2c4f85310ba955a05cb3a03081c76ab3802fe6756bcdc209b45194c29caf3bc0ab429687e3e262e1a120f57d1ede05b01a8580ab2 SHA512 51bcb805b7e9f0669d6c8b213061bd948662a89545921375bd4caf4dae84b2e68332b220992c00b70dae3a1de1cf3605f546295195b01b5366b730adea2196bf
+DIST yatex1.80.tar.gz 376944 BLAKE2B 355726fb3b38bfbc314647739d4af6e588848b5ade208fe1e026106a7cc2c220edcf10214f37ee7c9cc461ecb3e776c3969e329d5a331b3d8ce9f669f2361e26 SHA512 6548d1ac95ce95198468698d9b91449736e4be8af15d29352c00f7604fd7b34b2c606afb2d90d1115fd64dc859efdd9c993a6b3733f9321ca7671615977b4bd5
+EBUILD yatex-1.77.ebuild 1190 BLAKE2B 35dd69440203527beeb44ca225d06d0de1bad4b443627fed20b46389ace71992a1b498b2e57147e34bfba7a9e802e3468db11c7517de99c238ad1d85263ee60e SHA512 e9870ed7919d48d71b42e0b77621273c9c3af5d89e59f371beca8962b0190f0495804333e051f1745b12d11e732fa492fdf9ee7835233d447bd11dc6bd3d39c4
+EBUILD yatex-1.80.ebuild 1188 BLAKE2B 37ec4e8ff680962b233156a5ee8d3af623eeae5be35ecfb105f2f4be3848a83a4ad7a6ffef3ed2291dfa84f68572b3584c5ef9db2532f99de5dc863fd8f032ba SHA512 d4f83a73c04be1d56a46e433daf9f69cbc43288b4376e63b067b12bdc7162d2d6e09de79dcf1182bded4692519d6e55b26a8bcb588b677dc80ecd93bb14daead
+MISC metadata.xml 782 BLAKE2B d0c36397f1e8e6a2b12038086db26f4a617cce607962833a40381357159404e33841d4cd011355db4f927d81c723d57b8243cf9e1141cdc8d94b8880a5a73392 SHA512 427d7a218d2355e7a35b5371be149bb1e3c0168c9ab46f4c6e22c92f9d28c3ae430c6b476bda66150755608d7d28c46c80744aa7c5a1b6bf24c15a9aa0a908bc
diff --git a/app-emacs/yatex/files/yatex-1.76-direntry.patch b/app-emacs/yatex/files/yatex-1.76-direntry.patch
index 8dc0c5f310f7..d792a0710961 100644
--- a/app-emacs/yatex/files/yatex-1.76-direntry.patch
+++ b/app-emacs/yatex/files/yatex-1.76-direntry.patch
@@ -1,5 +1,5 @@
---- yatex1.76-orig/docs/yahtmle.tex
-+++ yatex1.76/docs/yahtmle.tex
+--- a/docs/yahtmle.tex
++++ b/docs/yahtmle.tex
 @@ -1,9 +1,10 @@
  \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
@@ -13,8 +13,8 @@
  @end direntry
  
  @iftex
---- yatex1.76-orig/docs/yahtmlj.tex
-+++ yatex1.76/docs/yahtmlj.tex
+--- a/docs/yahtmlj.tex
++++ b/docs/yahtmlj.tex
 @@ -1,9 +1,10 @@
  \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
@@ -28,8 +28,8 @@
  @end direntry
  
  @iftex
---- yatex1.76-orig/docs/yatexe.tex
-+++ yatex1.76/docs/yatexe.tex
+--- a/docs/yatexe.tex
++++ b/docs/yatexe.tex
 @@ -1,9 +1,10 @@
  \def\lang{jp} % -*- texinfo -*-
  \input texinfo.tex
@@ -43,8 +43,8 @@
  @end direntry
  
  @iftex
---- yatex1.76-orig/docs/yatexj.tex
-+++ yatex1.76/docs/yatexj.tex
+--- a/docs/yatexj.tex
++++ b/docs/yatexj.tex
 @@ -1,9 +1,10 @@
  \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
diff --git a/app-emacs/yatex/files/yatex-1.76-gentoo.patch b/app-emacs/yatex/files/yatex-1.76-gentoo.patch
index b961b31798e1..ed2b52aeaa19 100644
--- a/app-emacs/yatex/files/yatex-1.76-gentoo.patch
+++ b/app-emacs/yatex/files/yatex-1.76-gentoo.patch
@@ -1,5 +1,5 @@
---- yatex1.73-orig/yatexhlp.el	2006-12-24 07:25:29.000000000 +0100
-+++ yatex1.73/yatexhlp.el	2008-05-12 12:19:02.000000000 +0200
+--- a/yatexhlp.el
++++ b/yatexhlp.el
 @@ -9,12 +9,7 @@
  			 (cond (YaTeX-japan "jp")
  			       (t "eng"))))
diff --git a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
index 73ff873cce34..d2e2fe1d5694 100644
--- a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
+++ b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
@@ -1,21 +1,21 @@
---- yatex1.77-orig/docs/yahtmle.tex
-+++ yatex1.77/docs/yahtmle.tex
+--- a/docs/yahtmle.tex
++++ b/docs/yahtmle.tex
 @@ -1,4 +1,4 @@
 -\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
 +@c \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
  @setfilename yahtml.info
  @settitle Yet Another html-mode for Emacs
---- yatex1.77-orig/docs/yahtmlj.tex
-+++ yatex1.77/docs/yahtmlj.tex
+--- a/docs/yahtmlj.tex
++++ b/docs/yahtmlj.tex
 @@ -1,4 +1,4 @@
 -\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
 +@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
  @setfilename yahtml-ja.info
  @settitle Yet Another html-mode for Emacs
---- yatex1.77-orig/docs/yatexe.tex
-+++ yatex1.77/docs/yatexe.tex
+--- a/docs/yatexe.tex
++++ b/docs/yatexe.tex
 @@ -1,4 +1,4 @@
 -\def\lang{jp} % -*- texinfo -*-
 +@c \def\lang{jp} % -*- texinfo -*-
@@ -76,8 +76,8 @@
    Check the current completion type is specified one and cause error if
  not. The variable @code{YaTeX-current-completion-type} holds the symbol
  according to the current completion type.
---- yatex1.77-orig/docs/yatexj.tex
-+++ yatex1.77/docs/yatexj.tex
+--- a/docs/yatexj.tex
++++ b/docs/yatexj.tex
 @@ -1,4 +1,4 @@
 -\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
 +@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
diff --git a/app-emacs/yatex/files/yatex-1.80-texinfo-5.patch b/app-emacs/yatex/files/yatex-1.80-texinfo-5.patch
new file mode 100644
index 000000000000..49e55b608f1d
--- /dev/null
+++ b/app-emacs/yatex/files/yatex-1.80-texinfo-5.patch
@@ -0,0 +1,247 @@
+--- a/docs/yahtmle.tex
++++ b/docs/yahtmle.tex
+@@ -1,4 +1,4 @@
+-\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
++@c \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+ @setfilename yahtmle
+ @settitle Yet Another html-mode for Emacs
+@@ -14,10 +14,9 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another html-mode for emacs
+ @title // yahtml //
+-%@subtitle // yahtml //
++@c @subtitle // yahtml //
+ @author @copyright{} 1994-2012 by    HIROSE, Yuuji [yuuji@@yatex.org]
+ @end titlepage
+ 
+--- a/docs/yahtmlj.tex
++++ b/docs/yahtmlj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+ @setfilename yahtmlj
+ @settitle Yet Another html-mode for Emacs
+@@ -14,7 +14,6 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another html-mode for emacs
+ @title 『HTML屋』
+ @subtitle // yahtml //
+--- a/docs/yatexe.tex
++++ b/docs/yatexe.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*-
++@c \def\lang{jp} % -*- texinfo -*-
+ \input texinfo.tex
+ @setfilename yatexe
+ @settitle Yet Another tex-mode for Emacs
+@@ -14,7 +14,6 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another tex-mode for emacs
+ @title Wild Bird
+ @subtitle // YaTeX //
+@@ -713,7 +712,7 @@
+ @item M-x YaTeX-section-overview
+         @dots{} Generate *Sectioning Lines* buffer
+ @end table
+-@cindex{Generate the listing of sectioning units}
++@cindex Generate the listing of sectioning units
+ from the LaTeX source buffer.  In this listing buffer, typing @kbd{u} on
+ the sectioning command shifts up the corresponding sectioning command in
+ source text and @kbd{d} shifts down.  After marking lines in the listing
+@@ -1133,7 +1132,7 @@
+ @node Invoking image processor, Jump to main file, Jump to corresponding object, Cursor jump
+ @comment  node-name,  next,  previous,  up
+ @section Invoking image processor
+-@cindex{Drawing tool invocation}
++@cindex Drawing tool invocation
+ 
+ `image-including line' described above means such lines as
+ @code{\epsfile@{file=foo.ps@}}.  If you type @kbd{[prefix] g} on that
+@@ -1756,44 +1755,44 @@
+ @end defvar
+ 
+ @defvar YaTeX-cmd-gimp
+-Command name of GIMP (code{"gimp"})
++Command name of GIMP (@code{"gimp"})
+ @end defvar
+ @defvar YaTeX-cmd-tgif
+-Command name of tgif (code{"tgif"})
++Command name of tgif (@code{"tgif"})
+ @end defvar
+ @defvar YaTeX-cmd-inkscape
+-Command name of Inkscape (code{"inkscape"})
++Command name of Inkscape (@code{"inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-dia
+-Command name of Dia (code{"dia"})
++Command name of Dia (@code{"dia"})
+ @end defvar
+ @defvar YaTeX-cmd-ooo
+-Command name of OpenOffice.org/LibreOffice (code{"soffice"})
++Command name of OpenOffice.org/LibreOffice (@code{"soffice"})
+ @end defvar
+ @defvar YaTeX-cmd-gs
+-Command name of Ghostscript (code{"gs"})
++Command name of Ghostscript (@code{"gs"})
+ @end defvar
+ @defvar YaTeX-cmd-dvips
+-Command name of dvips (code{"dvips"})
++Command name of dvips (@code{"dvips"})
+ @end defvar
+ @defvar YaTeX-cmd-displayline
+ Command name of displayline
+-(code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
++(@code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-ps
+-Command name for editing PostScript files(Value of code{"YaTeX-cmd-gimp"})
++Command name for editing PostScript files(Value of @code{"YaTeX-cmd-gimp"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-pdf
+-Command name for editing PDF files(Value of code{"YaTeX-cmd-ooo"})
++Command name for editing PDF files(Value of @code{"YaTeX-cmd-ooo"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-ai
+-Command name for editing `.ai' files(Value of code{"YaTeX-cmd-inkscape"})
++Command name for editing `.ai' files(Value of @code{"YaTeX-cmd-inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-svg
+-Command name for editing SVG files(Value of code{"YaTeX-cmd-inkscape"})
++Command name for editing SVG files(Value of @code{"YaTeX-cmd-inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-images
+-Command name for editing image files(Value of code{"YaTeX-cmd-gimp"})
++Command name for editing image files(Value of @code{"YaTeX-cmd-gimp"})
+ @end defvar
+ 
+ @defvar YaTeX-need-nonstop
+@@ -2289,9 +2288,9 @@
+ @table @kbd
+ @item [F]
+ YaTeX:read-position
+-@itemx [A]
++@item [A]
+ Character list which can show up in the brackets
+-@itemx [D]
++@item [D]
+    Return the location specifier such as `[htb]'.  When
+ nothing is entered, omit [] itself.  If the possible characters
+ are "htbp", call this function as
+@@ -2299,9 +2298,9 @@
+ 
+ @item [F]
+ YaTeX:read-coordinates
+-@itemx [A]
++@item [A]
+ Base prompt, X-axis prompt, Y-axis prompt     (each optional)        
+-@itemx [D]
++@item [D]
+   Read the coordinates with the prompt ``BasePrompt X-axisPrompt:'' for
+ X-axis, ``BasePrompt Y-axisPrompt:'' for Y-axis, and return it in the form 
+ of ``(X,Y)''.  The default prompts are @code{Dimension}, @code{X},
+@@ -2309,9 +2308,9 @@
+ 
+ @item [F]
+ YaTeX:check-completion-type
+-@itemx [A]
++@item [A]
+ One of the symbols: 'begin, 'section, or 'maketitle
+-@itemx [D]
++@item [D]
+   Check the current completion type is specified one and cause error if
+ not. The variable @code{YaTeX-current-completion-type} holds the symbol
+ according to the current completion type.
+--- a/docs/yatexj.tex
++++ b/docs/yatexj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+ @setfilename yatexj
+ @settitle Yet Another tex-mode for Emacs
+@@ -19,7 +19,6 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another tex-mode for emacs
+ @title 『野鳥』
+ @subtitle // YaTeX //
+@@ -1146,7 +1145,7 @@
+ @section 括弧入力補助
+ @cindex 括弧入力補助[かつこにゆうりよくほしよ]
+ 
+-  3種類ある括弧 () {} [] の開き括弧を入れたときに閉じ括弧を自動的に入れます。
++  3種類ある括弧 () @{@} [] の開き括弧を入れたときに閉じ括弧を自動的に入れます。
+ @code{\} の直後にの @code{[} を入れると行を分けてインデントを揃え、
+ 数式入力に備えます。その他 La@TeX{} のマクロに応じて括弧の釣合の取れた
+ 状態に導きます。開き括弧そのものを1つだけ入れたいときは @kbd{C-q} で
+@@ -1965,44 +1964,44 @@
+ @end defvar
+ 
+ @defvar YaTeX-cmd-gimp
+-GIMPを起動するコマンド (code{"gimp"})
++GIMPを起動するコマンド (@code{"gimp"})
+ @end defvar
+ @defvar YaTeX-cmd-tgif
+-tgifを起動するコマンド (code{"tgif"})
++tgifを起動するコマンド (@code{"tgif"})
+ @end defvar
+ @defvar YaTeX-cmd-inkscape
+-Inkscapeを起動するコマンド (code{"inkscape"})
++Inkscapeを起動するコマンド (@code{"inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-dia
+-Diaを起動するコマンド (code{"dia"})
++Diaを起動するコマンド (@code{"dia"})
+ @end defvar
+ @defvar YaTeX-cmd-ooo
+-OpenOffice.orgまたはLibreOfficeを起動するコマンド (code{"soffice"})
++OpenOffice.orgまたはLibreOfficeを起動するコマンド (@code{"soffice"})
+ @end defvar
+ @defvar YaTeX-cmd-gs
+-Ghostscriptを起動するコマンド (code{"gs"})
++Ghostscriptを起動するコマンド (@code{"gs"})
+ @end defvar
+ @defvar YaTeX-cmd-dvips
+-dvipsを起動するコマンド(環境によってはpdvipsなど) (code{"dvips"})
++dvipsを起動するコマンド(環境によってはpdvipsなど) (@code{"dvips"})
+ @end defvar
+ @defvar YaTeX-cmd-displayline
+ displaylineを起動するコマンド
+-(code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
++(@code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-ps
+-PostScriptファイルを編集するコマンド (変数code{"YaTeX-cmd-gimp"}の値)
++PostScriptファイルを編集するコマンド (変数@code{"YaTeX-cmd-gimp"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-pdf
+-PDFファイルを編集するコマンド (変数code{"YaTeX-cmd-ooo"}の値)
++PDFファイルを編集するコマンド (変数@code{"YaTeX-cmd-ooo"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-ai
+-.aiファイルを編集するコマンド (変数code{"YaTeX-cmd-inkscape"}の値)
++.aiファイルを編集するコマンド (変数@code{"YaTeX-cmd-inkscape"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-svg
+-SVGファイルを編集するコマンド (変数code{"YaTeX-cmd-inkscape"}の値)
++SVGファイルを編集するコマンド (変数@code{"YaTeX-cmd-inkscape"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-images
+-その他画像ファイルを編集するコマンド (変数code{"YaTeX-cmd-gimp"}の値)
++その他画像ファイルを編集するコマンド (変数@code{"YaTeX-cmd-gimp"}の値)
+ @end defvar
+ 
+ @defvar YaTeX-need-nonstop
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
index d82c1ecb87c7..809a13113afc 100644
--- a/app-emacs/yatex/metadata.xml
+++ b/app-emacs/yatex/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<maintainer type="project">
-  <email>cjk@gentoo.org</email>
-  <name>Cjk</name>
-</maintainer>
-<longdescription lang="en">
-  YaTeX is an intelligent, acquisitive and integrated package which reduces
-  your efforts of composing LaTeX source on Emacs. And yahtml is the honest
-  and bright YaTeX-compatible major-mode package for writing HTML. If you have
-  noticed the power of YaTeX, you can drive yahtml over the HTML files quickly
-  and steadily. And vice versa, of course.
-</longdescription>
-<stabilize-allarches/>
+	<maintainer type="project">
+		<email>gnu-emacs@gentoo.org</email>
+		<name>Gentoo GNU Emacs project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		YaTeX is an intelligent, acquisitive and integrated package which reduces
+		your efforts of composing LaTeX source on Emacs. And yahtml is the honest
+		and bright YaTeX-compatible major-mode package for writing HTML. If you have
+		noticed the power of YaTeX, you can drive yahtml over the HTML files quickly
+		and steadily. And vice versa, of course.
+	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/yatex/yatex-1.76.ebuild b/app-emacs/yatex/yatex-1.76.ebuild
deleted file mode 100644
index 47cd7c4e7d43..000000000000
--- a/app-emacs/yatex/yatex-1.76.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp eutils
-
-DESCRIPTION="Yet Another TeX mode for Emacs"
-HOMEPAGE="http://www.yatex.org/"
-SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
-
-KEYWORDS="amd64 ppc ~ppc64 x86"
-SLOT="0"
-LICENSE="YaTeX"
-IUSE="l10n_ja"
-
-S="${WORKDIR}/${P/-/}"
-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
-
-	cd docs
-	makeinfo yatexe.tex yahtmle.tex || die
-
-	if use l10n_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() {
-	elisp-install ${PN} *.el || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	insinto ${SITEETC}/${PN}
-	doins help/YATEXHLP.eng
-	doinfo docs/yatex.info* docs/yahtml.info*
-	dodoc docs/*.eng
-
-	if use l10n_ja; then
-		doins help/YATEXHLP.jp
-		doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
-		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
-	fi
-}
diff --git a/app-emacs/yatex/yatex-1.77.ebuild b/app-emacs/yatex/yatex-1.77.ebuild
index 7b7534cc7785..3909baa70f86 100644
--- a/app-emacs/yatex/yatex-1.77.ebuild
+++ b/app-emacs/yatex/yatex-1.77.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="Yet Another TeX mode for Emacs"
 HOMEPAGE="http://www.yatex.org/"
-SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
+SRC_URI="http://www.${PN}.org/${P/-}.tar.gz"
 
 KEYWORDS="amd64 ppc ~ppc64 x86"
 SLOT="0"
 LICENSE="YaTeX"
 IUSE="l10n_ja"
 
-S="${WORKDIR}/${P/-/}"
+S="${WORKDIR}/${P/-}"
+
 ELISP_PATCHES="${PN}-1.76-gentoo.patch
 	${PN}-1.76-direntry.patch
 	${PN}-1.77-texinfo-5.patch"
@@ -25,27 +26,27 @@ src_compile() {
 	# that are only available under X
 
 	cd docs
-	makeinfo yatexe.tex yahtmle.tex || die
+	makeinfo {${PN},yahtml}e.tex || die
 
 	if use l10n_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
+		iconv -f WINDOWS-31J -t UTF-8 ${PN}j.tex  > ${PN}-ja.texi  || die
+		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex > yahtml-ja.texi || die
+		makeinfo {${PN},yahtml}-ja.texi || die
 	fi
 }
 
 src_install() {
-	elisp-install ${PN} *.el || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-install ${PN} *.el
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 
 	insinto ${SITEETC}/${PN}
 	doins help/YATEXHLP.eng
-	doinfo docs/yatex.info* docs/yahtml.info*
+	doinfo docs/{${PN},yahtml}.info*
 	dodoc docs/*.eng
 
 	if use l10n_ja; then
 		doins help/YATEXHLP.jp
-		doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
-		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
+		doinfo docs/{${PN},yahtml}-ja.info*
+		dodoc 00readme install docs/{htmlqa,qanda,*.doc}
 	fi
 }
diff --git a/app-emacs/yatex/yatex-1.80.ebuild b/app-emacs/yatex/yatex-1.80.ebuild
new file mode 100644
index 000000000000..70503b9d1dff
--- /dev/null
+++ b/app-emacs/yatex/yatex-1.80.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit elisp
+
+DESCRIPTION="Yet Another TeX mode for Emacs"
+HOMEPAGE="http://www.yatex.org/"
+SRC_URI="http://www.${PN}.org/${P/-}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="BSD-2"
+IUSE="l10n_ja"
+
+S="${WORKDIR}/${P/-}"
+
+ELISP_PATCHES="${PN}-1.76-direntry.patch
+	${P}-texinfo-5.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	sed -i "/(help-dir/,/)))/c\      (help-dir \"${SITEETC}/${PN}\"))" ${PN}hlp.el
+
+	elisp_src_prepare
+}
+
+src_compile() {
+	cd docs
+	makeinfo {${PN},yahtml}e.tex || die
+
+	if use l10n_ja; then
+		iconv -f WINDOWS-31J -t UTF-8 ${PN}j.tex  > ${PN}-ja.texi  || die
+		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex > yahtml-ja.texi || die
+		makeinfo {${PN},yahtml}-ja.texi || die
+	fi
+}
+
+src_install() {
+	elisp-install ${PN} *.el
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+	insinto ${SITEETC}/${PN}
+	doins help/YATEXHLP.eng
+	doinfo docs/{${PN},yahtml}.info*
+	dodoc install docs/*.eng
+
+	if use l10n_ja; then
+		doins help/YATEXHLP.jp
+		doinfo docs/{${PN},yahtml}-ja.info*
+		dodoc 00readme ${PN}.new docs/{htmlqa,qanda,*.doc}
+	fi
+}