reinit the tree, so we can have metadata

8 files changed, 932 insertions, 0 deletions

diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
new file mode 100644
index 000000000000..8a65c91bfa42
--- /dev/null
+++ b/dev-tex/tex4ht/Manifest
@@ -0,0 +1,12 @@
+AUX 50tex4ht.cnf 192 SHA256 5c9659aad7091b763e4a1363d78629a1ad8e1fe5ba679c151b95c69f4de9d9c1 SHA512 fec1a4ab9a3a493476a255001303c84a30fcf67873bd2639d177b414cf90880a149d31a68d6ce0dfd104b877bfc3fc2d39b1bb38a0f9d7c511bd311e0bfefc48 WHIRLPOOL 4441b6bc358912a9af3c77a340c17684b760aa0e4997a7bb8db6e7a1b28d9a475660cd224f8657a1b929e802da521f59d223034fbc4eca8b9a2bb5bfd60e2e0e
+AUX tex4ht-texlive-updates.patch 16596 SHA256 34b803f68ebe65c8de910c513106401e21e5e87b07958f8d3731523efebf5bc8 SHA512 6de0be6adb3ad494cd8935d3744882fb646ae4db2caaf0d13fb712fb5445c233e7b78385f5da175d8f694047839d1496189fe5c4fc739eadc9ef05da351fc443 WHIRLPOOL d42e80e83030a5f9876385623f3b4374933742e66007608769d2b34ad463c2a1657571de37b38bcae9f148038cc29a4098b05eced5c9c1232f6c2f8bca8951df
+DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 SHA256 9f3e259641bb7d5f32b8efaa85cb7c1a9f1a17f5fc6a859c81449d9984ec91a3 SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963 WHIRLPOOL 3fd49876e0cc19432c0ba5142848dd034a528441586550c49d04187a301ceb44a7d4374ef57a5b658a19e32b039ce1cdaa742331baf0008d51098567556e46cd
+DIST tex4ht-texlive-2015-08-03.tar.xz 801488 SHA256 2882e4c8e6510b742feef206e719725f5146f75b48db55449ca4dbff992dd6b1 SHA512 a8a56e0d41406df8c76d72eea6f726f012d70a46665d9dfe99c7362790a2f0126f2c21e07c5de08aff7694e9837c47e162aa6790c256b4538f4780551f6e6191 WHIRLPOOL cc41c346ba8f1bd7dfae6e2335c9f1611d73e768b6f251fcbdffad18172a16f3b41d6c0eb6a0d2a04a69fee09f1ed896212df1e7851b4ca3698d5640a9ec6ea4
+DIST tex4ht-texlive-2017-02-05.tar.xz 826816 SHA256 af949bfe7c4e5ef6919e5b43223bc4f0e9f2148d2a322f8087e9eee821965151 SHA512 c5a62a10b956d1108f288490e966e9c225555a74ace7744058a4464e4b166f3906d429ed8557d640ca0e9b4dbcc4278ef20298e869560a906c85c68ff832be52 WHIRLPOOL 21816076fad610d714e8b306f8d0be8681acc33af046e1bf72529817906bbf4ed0b6d5eaefa718568f58296c1d1acdcda309136219960c5cc9b8eb25abf7a747
+EBUILD tex4ht-20090611_p1038-r2.ebuild 3354 SHA256 3a01a993b57386ab73bafe2cb1a0910134d7b521794e99990183922907771111 SHA512 5fa5b727ba48b45664e2da674a4c5ca208da870263304ad7d7a10c046d1bef12f2abd479302c57494e1313e680c24ab0497d038c836581315419aa128d89e504 WHIRLPOOL 44273d0a3d76da445cbacf3c19b2c6f2f213d8b86cb9834fd0232130093dd4871d4ac4821d4c7ab7ce094e1f6f579378a5bc948265b73410fee0f3ea7f2fc980
+EBUILD tex4ht-20090611_p1038-r3.ebuild 3571 SHA256 73344e80fa6317a474430445b8fa49cb50decd6f331dcffc1f188238ff1845df SHA512 a6a247e36515af832588250fa87ca098e7386088f36f39431ef1d6a182a2136fdfaa3a50a732ded9c5bcd334c5d7f060df25859b304b17f62173d56191c06732 WHIRLPOOL ebf430aec8142b8eca40ddbbed8e9305d669bc8081e84cb52b97e5e580c9597d536d3b2f08509c60e3c1f7812ee934a95fc192397103a262acae5bb1bb56f619
+EBUILD tex4ht-20090611_p1038-r4.ebuild 3645 SHA256 8885b28c4695651e5eaf6ce2beb7d2971995235728d2367b10594b1c521773aa SHA512 29252db9bd919f743f325a54f1efb72513fb07b040dcd963e2b566d5c5f9b470624a72e11c4cb47908d893df0c55118af06d5f2e426d5ef1388fd5bd57468569 WHIRLPOOL cb2723410f53f43b75828f15ec4579ead9718525f7a63febac6a0989cdab24f67b00e0d63e9c6da53c917a42db16769c6a25652a67b04530b19130ba74c212ad
+EBUILD tex4ht-20090611_p1038-r5.ebuild 3650 SHA256 5ce32df17c3f6359eb5c5e04f4ff92d2065bbb5149174b4a91d0fd2f5e93c243 SHA512 e015d9d1ab77e1b9746f1c01d58ecbfe12299d859e2ed564bec944850275f8b556135dde95bf9e586602a049625baa30b66fc8de8c4f189e926b50a4fa4ee49f WHIRLPOOL add0b7281ac4c5e3d131b843cc94a57f0271a8bea49de03da76bd39e21b282b79bf87646fe367ba761c31e1ee8773e9e00cc15238b9969f09fe5b6ae3a888a0e
+MISC ChangeLog 3250 SHA256 d60a0c3e3c1ae48e2d2ab85e3716abc29558c08a2be61be7e50ad57c524022f0 SHA512 6b3fe4703e72c82eecf579eb68da32d9a1c5b965c8225f13dfac152d467a4ad6363fa0d482946fb81d5ec213121c537d1f1ca722cb2140254f7fec0dbd2d0392 WHIRLPOOL 878537ed578d68c7ef7d5d59119c76e825aa3e45b933e5fb0f7a15ec2ba24dcc40d4578fff1fcc8d3e4fcd9d6042d36230335a06b6accc0925e9734396dbcc42
+MISC ChangeLog-2015 12991 SHA256 fabad99d4aab6e6cc6389da49841fe175fafa63bb7102a42309a4cac94cd63e4 SHA512 888ae5003bcecb88ab494f32c9d2652d1a9810999b7cacd1ff3320098d321c3827ddf0933bf489c156ef932118c015156e2b0f54c2f1204c7719021d9f97e66e WHIRLPOOL 257ea27bb26828c624c2de6c28987845a8228e08cd9d743edf94b28956d2fb866adbe6945385b84ee6fb52e4158a189a890270769da8bf2d3462f77dc0aeba8a
+MISC metadata.xml 317 SHA256 fad803dd5f6d49258a631e3f9c86f75239f9acd4b581860ce0a8bcce46a75fad SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af WHIRLPOOL 3c12cb9aad7142629a9836c40997adfdad92f90999f6e8f54f8290f75e142265b4310808c3d07daea33a22cd6ead16983b4b1581ef5e8f8bbf74cbe92bfed662
diff --git a/dev-tex/tex4ht/files/50tex4ht.cnf b/dev-tex/tex4ht/files/50tex4ht.cnf
new file mode 100644
index 000000000000..a6adf9281c87
--- /dev/null
+++ b/dev-tex/tex4ht/files/50tex4ht.cnf
@@ -0,0 +1,4 @@
+% -- tex4ht configuration params added by texmf-update --
+TEX4HTINPUTS=.;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts//
+T4HTINPUTS=.;$TEXMF/tex4ht/base//
+% -- tex4ht configuration ends here --
diff --git a/dev-tex/tex4ht/files/tex4ht-texlive-updates.patch b/dev-tex/tex4ht/files/tex4ht-texlive-updates.patch
new file mode 100644
index 000000000000..dc0a15912155
--- /dev/null
+++ b/dev-tex/tex4ht/files/tex4ht-texlive-updates.patch
@@ -0,0 +1,428 @@
+diff -ur texmf/tex/generic/tex4ht/biblatex.4ht texmf-dist/tex/generic/tex4ht/biblatex.4ht
+--- texmf/tex/generic/tex4ht/biblatex.4ht	2009-06-11 11:20:16.000000000 -0300
++++ texmf-dist/tex/generic/tex4ht/biblatex.4ht	2011-09-18 20:09:39.000000000 -0300
+@@ -1,6 +1,7 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-% biblatex.4ht                          2009-05-21-09:32 %
++% biblatex.4ht                          2011-09-18-16:07 %
+ % Copyright (C) 2007--2009       Eitan M. Gurari         %
++%               2009--2011       TeX Users Group         %
+ %                                                        %
+ % This work may be distributed and/or modified under the %
+ % conditions of the LaTeX Project Public License, either %
+@@ -14,24 +15,39 @@
+ % This work has the LPPL maintenance status "maintained".%
+ %                                                        %
+ % This Current Maintainer of this work                   %
+-% is Eitan M. Gurari.                                    %
++% is the TeX4ht Project <tex4ht@tug.org>.                %
+ %                                                        %
+ % If you modify this program your changing its signature %
+ % with a directive of the following form will be         %
+ % appreciated.                                           %
+ %            \message{signature}                         %
+ %                                                        %
+-%                             gurari@cse.ohio-state.edu  %
+-%                 http://www.cse.ohio-state.edu/~gurari  %
++%                                        tex4ht@tug.org  %
++%                             http://www.tug.org/tex4ht  %
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-\immediate\write-1{version 2009-05-21-09:32}
+-
++\immediate\write-1{version 2011-09-18-16:07}
++%
++% This work may be distributed and/or modified under the
++% conditions of the LaTeX Project Public License, either
++% version 1.3c of this license or (at your option) any
++% later version. The latest version of this license is in
++%   http://www.latex-project.org/lppl.txt
++% and version 1.3c or later is part of all distributions
++% of LaTeX version 2005/12/01 or later.
++%
++% This work has the LPPL maintenance status "maintained".
++%
++% The Current Maintainer of this work
++% is the TeX4ht Project <http://tug.org/tex4ht>.
++%
++% If you modify this program, changing the
++% version identification would be appreciated.
+    \ifx \blx@startbib\:UnDef
+       \pend:def\blx@shorthands{%
+    \pend:def\blx@bibinit{%
+        \HAssign\shorthands:cnt=0
+        \NewConfigure{printfield-shorthand}{2}%
+-       \Configure{printfield-shorthand}
++       \Configure{printfield-shorthand}%
+          {\gHAdvance\shorthands:cnt by 1\relax
+           \ifnum \shorthands:cnt=1 \a:printshorthands
+           \else                    \c:printshorthands \fi
+@@ -50,10 +66,10 @@
+   \@nameuse {blx@rerun}}
+ \pend:def\blx@bibliography{%
+   \pend:def\blx@bibinit{%
+-     \ConfigureList{thebibliography}
+-        {\a:thebibliography}
+-        {\b:thebibliography}
+-        {\c:thebibliography}
++     \ConfigureList{thebibliography}%
++        {\a:thebibliography}%
++        {\b:thebibliography}%
++        {\c:thebibliography}%
+         {\d:thebibliography}%
+      \csname onthebibliography:list\endcsname
+   }%
+@@ -75,8 +91,8 @@
+       \NewConfigure{printfield-#2}{2}%
+       \a:printfield{printfield-#2}%
+    \fi
+-   \Configure{blx@unit}
+-       {\csname a:printfield-#2\endcsname}
++   \Configure{blx@unit}%
++       {\csname a:printfield-#2\endcsname}%
+        {\csname b:printfield-#2\endcsname}%
+    \csname o:\string\blx@printfield:\endcsname[#1]{#2}%
+ }
+@@ -92,8 +108,8 @@
+       \NewConfigure{bibstring-#2}{2}%
+       \a:printfield{bibstring-#2}%
+    \fi
+-   \Configure{blx@unit}
+-       {\csname a:bibstring-#2\endcsname}
++   \Configure{blx@unit}%
++       {\csname a:bibstring-#2\endcsname}%
+        {\csname b:bibstring-#2\endcsname}%
+    \csname o:\string\blx@bibstring:\endcsname[#1]{#2}%
+ }
+@@ -103,8 +119,8 @@
+       \NewConfigure{bibcpstring-#2}{2}%
+       \a:printfield{bibcpstring-#2}%
+    \fi
+-   \Configure{blx@unit}
+-       {\csname a:bibcpstring-#2\endcsname}
++   \Configure{blx@unit}%
++       {\csname a:bibcpstring-#2\endcsname}%
+        {\csname b:bibcpstring-#2\endcsname}%
+    \csname o:\string\blx@bibcpstring:\endcsname[#1]{#2}%
+ }
+@@ -114,8 +130,8 @@
+       \NewConfigure{biblcstring-#2}{2}%
+       \a:printfield{biblcstring-#2}%
+    \fi
+-   \Configure{blx@unit}
+-       {\csname a:biblcstring-#2\endcsname}
++   \Configure{blx@unit}%
++       {\csname a:biblcstring-#2\endcsname}%
+        {\csname b:biblcstring-#2\endcsname}%
+    \csname o:\string\blx@biblcstring:\endcsname[#1]{#2}%
+ }
+@@ -125,13 +141,13 @@
+       \NewConfigure{bibucstring-#2}{2}%
+       \a:printfield{bibucstring-#2}%
+    \fi
+-   \Configure{blx@unit}
+-       {\csname a:bibucstring-#2\endcsname}
++   \Configure{blx@unit}%
++       {\csname a:bibucstring-#2\endcsname}%
+        {\csname b:bibucstring-#2\endcsname}%
+    \csname o:\string\blx@bibucstring:\endcsname[#1]{#2}%
+ }
+ \expandafter\HLet\csname\string\blx@bibucstring\endcsname\:tempc
+-\NewConfigure{biblatex-style}[2]{
++\NewConfigure{biblatex-style}[2]{%
+    \def\:temp{#1}%
+    \ifx \:temp\blx@cbxfile
+       #2%
+@@ -149,10 +165,19 @@
+   \blx:item[#1]%
+   \ifhmode \spacefactor\blx@sf@par\fi
+ }
++\newskip\blx@unitmark
++\blx@unitmark=10pt plus 1pt minus 1pt
++\let\abx@aux@page\@gobbletwo
++\AtEndDocument{%
++  \def\abx@aux@page#1#2{\blx@addpagesum{#1}{#2}}%
++  \def\abx@aux@fnpage#1#2{\blx@addpagesum{#1}{#2}}}
++%
++\let\blx@resetpuncthook\@empty
++\let\blx@csq@ifkernmark\@empty
+ \def\blx@begunit{%
+   \toggletrue{blx@tempa}%
+-  \iftoggle{blx@insert}
+-    {\iftoggle{blx@unit}
++  \iftoggle{blx@insert}%
++    {\iftoggle{blx@unit}%
+        {\begingroup
+           \let\blx@begunit\@empty
+           \let\blx@endunit\@empty
+@@ -161,25 +186,25 @@
+         \global\togglefalse{blx@unit}%
+         \togglefalse{blx@tempa}}
+        {\blx@postpunct}%
+-     \iftoggle{blx@block}
++     \iftoggle{blx@block}%
+        {\begingroup
+           \let\blx@begunit\@empty
+           \let\blx@endunit\@empty
+           \newblockpunct
+         \endgroup
+         \global\togglefalse{blx@block}%
+-        \togglefalse{blx@tempa}}
+-       {}}
++        \togglefalse{blx@tempa}}%
++       {}}%
+     {}%
+   \blx@postpunct
+   \blx@resetpuncthook
+-  \iftoggle{blx@tempa}
+-    {}
++  \iftoggle{blx@tempa}%
++    {}%
+     {\global\togglefalse{blx@insert}}%
+   \csname a:blx@unit\endcsname
+   \blx@leavevmode
+   \blx@csq@ifkernmark
+-    {}
++    {}%
+     {\penalty\@M
+      \hskip-\blx@unitmark\relax
+      \hskip\blx@unitmark\relax}%
+@@ -204,14 +229,15 @@
+       
+    \fi
+    \NewConfigure{thebibliography}{4}
+-\append:def\blx@bibinit{\a:bibinit}
+-\NewConfigure{bibinit}{1}
++\append:def\blx@bibinit{\a:bibinit}%
++\NewConfigure{bibinit}{1}%
+ 
+    \let\blx@anchors\@empty
++\let\bib@field@entrykey\@empty
+ \protected\def\blx@anchor{%
+   \xifinlist{X\the\c@refsection -%@
+-\bib@field@entrykey}{\blx@anchors}
+-    {}
++\bib@field@entrykey}{\blx@anchors}%
++    {}%
+     {\listxadd\blx@anchors{X\the\c@refsection -%@
+ \bib@field@entrykey}%
+      \hyper:natanchorstart{X\the\c@refsection -%@
+@@ -219,22 +245,22 @@
+      \hyper:natanchorend}}
+ \protected\def\blx@bibhyperref{%
+    \@ifnextchar[%]
+-     {\blx@bibhyperref@i}
++     {\blx@bibhyperref@i}%
+      {\blx@bibhyperref@i[\bib@field@entrykey]}}%
+ \long\def\blx@bibhyperref@i[#1]#2{%
+    \hyper:natlinkstart{X\the\c@refsection -%@
+ #1}%
+-   #2\hyper:natlinkend}
++   #2\hyper:natlinkend}%
+ \protected\long\def\blx@bibhyperlink#1#2{%
+    \hyper:natlinkstart{X\the\c@refsection --%:
+ #1}%
+-   #2\hyper:natlinkend}
++   #2\hyper:natlinkend}%
+ \protected\long\def\blx@bibhypertarget#1#2{%
+    \@bsphack
+    \hyper:natanchorstart{X\the\c@refsection --%:
+ #1}%
+    \@esphack
+-   #2\hyper:natanchorend}
++   #2\hyper:natanchorend}%
+ \let\blx@ifhyperref\@firstoftwo
+ \def\hyper:natanchorstart#1{\Link{}{#1}\EndLink}
+ \def\hyper:natanchorend{}
+@@ -244,9 +270,9 @@
+    \let\:temp\do
+   \def\do#1{%
+     \patchcmd#1%
+-      {\color@begingroup}
+-      {\color@begingroup\toggletrue{blx@footnote}}
+-      {\togglefalse{blx@tempa}\listbreak}
++      {\color@begingroup}%
++      {\color@begingroup\toggletrue{blx@footnote}}%
++      {\togglefalse{blx@tempa}\listbreak}%
+       {}}%
+   \docsvlist{%
+     \@footnotetext,%          latex
+diff -ur texmf/tex/generic/tex4ht/hyperref.4ht texmf-dist/tex/generic/tex4ht/hyperref.4ht
+--- texmf/tex/generic/tex4ht/hyperref.4ht	2009-06-11 11:20:21.000000000 -0300
++++ texmf-dist/tex/generic/tex4ht/hyperref.4ht	2011-02-02 13:45:16.000000000 -0200
+@@ -1,6 +1,7 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-% hyperref.4ht                          2009-05-21-09:32 %
++% hyperref.4ht                          2011-01-30-16:01 %
+ % Copyright (C) 1999--2009       Eitan M. Gurari         %
++%               2009--2011       TeX Users Group         %
+ %                                                        %
+ % This work may be distributed and/or modified under the %
+ % conditions of the LaTeX Project Public License, either %
+@@ -14,17 +15,17 @@
+ % This work has the LPPL maintenance status "maintained".%
+ %                                                        %
+ % This Current Maintainer of this work                   %
+-% is Eitan M. Gurari.                                    %
++% is the TeX4ht Project <tex4ht@tug.org>.                %
+ %                                                        %
+ % If you modify this program your changing its signature %
+ % with a directive of the following form will be         %
+ % appreciated.                                           %
+ %            \message{signature}                         %
+ %                                                        %
+-%                             gurari@cse.ohio-state.edu  %
+-%                 http://www.cse.ohio-state.edu/~gurari  %
++%                                        tex4ht@tug.org  %
++%                             http://www.tug.org/tex4ht  %
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-\immediate\write-1{version 2009-05-21-09:32}
++\immediate\write-1{version 2011-01-30-16:01}
+ 
+ \csname end:hyperref\endcsname
+ \@ifpackageloaded{nameref}{}
+@@ -297,6 +298,26 @@
+        \expandafter\:tempa
+    \fi}
+ 
++\def\Hy@MakeCurrentHref#1{%
++  \edef\HyperLocalCurrentHref{#1}%
++  \@onelevel@sanitize\HyperLocalCurrentHref
++  \global\let\HyperGlobalCurrentHref\HyperLocalCurrentHref
++  \let\HyperLocalCurrentHref\HyperGlobalCurrentHref
++  \ifHy@localanchorname
++    \let\@currentHref\HyperLocalCurrentHref
++  \else
++    \global\let\@currentHref\HyperGlobalCurrentHref
++  \fi
++}
++
++\let\Hy@SectionAnchorHref\@gobble
++\newlength\Hy@SectionHShift
++
++\def\Hy@MakeCurrentHrefAuto#1{%
++  \Hy@GlobalStepCount\Hy@linkcounter
++  \Hy@MakeCurrentHref{#1.\the\Hy@linkcounter}%
++}
++
+ \def\hyper@makecurrent#1{%
+   \begingroup
+     \edef\Hy@param{#1}%
+diff -ur texmf/tex/generic/tex4ht/nameref.4ht texmf-dist/tex/generic/tex4ht/nameref.4ht
+--- texmf/tex/generic/tex4ht/nameref.4ht	2009-06-11 11:20:24.000000000 -0300
++++ texmf-dist/tex/generic/tex4ht/nameref.4ht	2010-09-26 19:41:25.000000000 -0300
+@@ -1,6 +1,6 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-% nameref.4ht                           2009-05-21-09:32 %
+-% Copyright (C) 2005--2009       Eitan M. Gurari         %
++% nameref.4ht                           2010-09-04-21:02 %
++% Copyright (C) 2005--2010       Eitan M. Gurari         %
+ %                                                        %
+ % This work may be distributed and/or modified under the %
+ % conditions of the LaTeX Project Public License, either %
+@@ -14,24 +14,27 @@
+ % This work has the LPPL maintenance status "maintained".%
+ %                                                        %
+ % This Current Maintainer of this work                   %
+-% is Eitan M. Gurari.                                    %
++% is the TeX4ht Project <tex4ht@tug.org>.                %
+ %                                                        %
+ % If you modify this program your changing its signature %
+ % with a directive of the following form will be         %
+ % appreciated.                                           %
+ %            \message{signature}                         %
+ %                                                        %
+-%                             gurari@cse.ohio-state.edu  %
+-%                 http://www.cse.ohio-state.edu/~gurari  %
++%                                        tex4ht@tug.org  %
++%                             http://www.tug.org/tex4ht  %
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-\immediate\write-1{version 2009-05-21-09:32}
++\immediate\write-1{version 2010-09-04-21:02}
+ 
+    \let\ltx@label\label
+ \def\prf:label{{\ifx \NR:Title\:UnDef \else \NR:Title\fi}%
+                {\ifx \NR:Type\:UnDef \else \NR:Type .1\fi}{}}%
+ \let\NR:StartSec\:StartSec
++\let\NR:no@sect\no@sect
++\def\no@sect#1#2#3#4#5#6[#7]#8{\gdef\NR:Title{\a:newlabel{#7}}%
++     \NR:no@sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{#8}}
+ \def\:StartSec#1#2#3{%
+-   \gdef\NR:Title{\a:newlabel{#3}}%
++%   \gdef\NR:Title{\a:newlabel{#3}}%
+    \gdef\NR:Type{#1}%
+    \NR:StartSec{#1}{#2}{#3}%
+    \gdef\@currentlabelname{#1}%
+diff -ur texmf/tex/generic/tex4ht/unicode.4ht texmf-dist/tex/generic/tex4ht/unicode.4ht
+--- texmf/tex/generic/tex4ht/unicode.4ht	2009-06-11 11:20:28.000000000 -0300
++++ texmf-dist/tex/generic/tex4ht/unicode.4ht	2011-09-18 20:09:39.000000000 -0300
+@@ -1,30 +1,22 @@
+-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-% unicode.4ht                           2009-02-23-20:45 %
+-% Copyright (C) 1998--2009       Eitan M. Gurari         %
+-%                                                        %
+-% This work may be distributed and/or modified under the %
+-% conditions of the LaTeX Project Public License, either %
+-% version 1.3 of this license or (at your option) any    %
+-% later version. The latest version of this license is   %
+-% in                                                     %
+-%   http://www.latex-project.org/lppl.txt                %
+-% and version 1.3 or later is part of all distributions  %
+-% of LaTeX version 2003/12/01 or later.                  %
+-%                                                        %
+-% This work has the LPPL maintenance status "maintained".%
+-%                                                        %
+-% This Current Maintainer of this work                   %
+-% is Eitan M. Gurari.                                    %
+-%                                                        %
+-% If you modify this program your changing its signature %
+-% with a directive of the following form will be         %
+-% appreciated.                                           %
+-%            \message{signature}                         %
+-%                                                        %
+-%                             gurari@cse.ohio-state.edu  %
+-%                 http://www.cse.ohio-state.edu/~gurari  %
+-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-\immediate\write-1{version 2009-02-23-20:45}
++% unicode.4ht (2010-12-18-17:40), generated from tex4ht-unicode.tex
++% Copyright (C) 1998-2009 Eitan M. Gurari
++%
++% This work may be distributed and/or modified under the
++% conditions of the LaTeX Project Public License, either
++% version 1.3c of this license or (at your option) any
++% later version. The latest version of this license is in
++%   http://www.latex-project.org/lppl.txt
++% and version 1.3c or later is part of all distributions
++% of LaTeX version 2005/12/01 or later.
++%
++% This work has the LPPL maintenance status "maintained".
++%
++% The Current Maintainer of this work
++% is the TeX4ht Project <http://tug.org/tex4ht>.
++%
++% If you modify this program, changing the
++% version identification would be appreciated.
++\immediate\write-1{version 2010-12-18-17:40}
+ 
+ \exit:ifnot{8859-6,% 
+ SIunits,% 
+@@ -1282,6 +1274,11 @@
+ 
+ 
+ 
++
++
++
++
++
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+                 \ConfigureHinput{eurosym}
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+@@ -1678,7 +1675,7 @@
+    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
+ \expand:after{\expand:after{\Configure{accent}}%
+    \csname OT1\string\H\endcsname}%
+-   \csname OT1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
++   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
+ {}{}}
+    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
+ \Configure{accent}\dot\dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%
diff --git a/dev-tex/tex4ht/metadata.xml b/dev-tex/tex4ht/metadata.xml
new file mode 100644
index 000000000000..cb4c69274d0d
--- /dev/null
+++ b/dev-tex/tex4ht/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer type="person">
+	<email>ulm@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r2.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r2.ebuild
new file mode 100644
index 000000000000..2e92d05371a3
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit latex-package toolchain-funcs java-pkg-opt-2
+
+IUSE=""
+
+# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
+MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
+
+DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
+HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
+	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
+SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz"
+
+LICENSE="LPPL-1.2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+
+DEPEND=">=sys-apps/sed-4
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-gfx/imagemagick
+	java? ( >=virtual/jre-1.5 )"
+
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-texlive-updates.patch"
+	cd "${S}/texmf/tex4ht/base/unix"
+	sed -i \
+		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
+		-e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!#" \
+		-e "s#%%~/texmf-dist#${EPREFIX}/usr/share/texmf#g" tex4ht.env \
+		|| die "sed of tex4ht.env failed"
+
+	einfo "Removing precompiled java stuff"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete
+}
+
+src_compile() {
+	cd "${S}/src/"
+	einfo "Compiling postprocessor sources..."
+	for f in tex4ht t4ht htcmd ; do
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
+			-DENVFILE="\"${EPREFIX}/usr/share/texmf/tex4ht/base/tex4ht.env\"" \
+			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
+			|| die "Compiling $f failed"
+	done
+	if use java; then
+		einfo "Compiling java files..."
+		cd java
+		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
+		cd "${S}/texmf/tex4ht/bin"
+		# Create the jar needed by oolatex
+		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+	fi
+}
+
+src_install () {
+	# install the binaries
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	# install the scripts
+	if ! use java; then
+		rm -f "${S}"/bin/unix/oo*
+		rm -f "${S}"/bin/unix/jh*
+	fi
+	dobin "${S}"/bin/unix/mk4ht || die
+
+	# install the .4ht scripts
+	insinto /usr/share/texmf/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/* || die
+
+	# install the special htf fonts
+	insinto /usr/share/texmf/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts" || die
+
+	if use java; then
+		# install the java files
+		doins -r "${S}/texmf/tex4ht/bin"
+		java-pkg_jarinto /usr/share/texmf/tex4ht/bin
+		java-pkg_dojar "${S}/${PN}.jar"
+	fi
+
+	# install the .4xt files
+	doins -r "${S}/texmf/tex4ht/xtpipes" || die
+
+	# install the env file
+	insinto /usr/share/texmf/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env || die
+
+	if latex-package_has_tetex_3 ; then
+		insinto /etc/texmf/texmf.d
+		doins "${FILESDIR}/50tex4ht.cnf" || die
+	fi
+
+	insinto /usr/share/texmf/tex/generic/${PN}
+	insopts -m755
+	doins "${S}"/bin/ht/unix/* || die
+}
+
+pkg_postinst() {
+	use java ||	elog 'ODF converters (oolatex & friends) require the java use flag'
+	latex-package_pkg_postinst
+	elog "In order to avoid collisions with multiple packages"
+	elog "We are not installing the scripts in /usr/bin anymore"
+	elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'"
+}
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
new file mode 100644
index 000000000000..b458380ac8c2
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+IUSE=""
+
+# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
+MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
+
+DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
+HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
+	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
+SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz"
+
+LICENSE="LPPL-1.2"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+
+DEPEND=">=sys-apps/sed-4
+	virtual/pkgconfig
+	dev-libs/kpathsea
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-gfx/imagemagick
+	dev-libs/kpathsea
+	java? ( >=virtual/jre-1.5 )"
+
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-texlive-updates.patch"
+	cd "${S}/texmf/tex4ht/base/unix"
+	sed -i \
+		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
+		-e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \
+		-e "s#%%~/texmf-dist#${EPREFIX}${TEXMF}#g" \
+		-e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \
+		tex4ht.env \
+		|| die "sed of tex4ht.env failed"
+
+	einfo "Removing precompiled java stuff"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete
+}
+
+src_compile() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	cd "${S}/src/"
+	einfo "Compiling postprocessor sources..."
+	for f in tex4ht t4ht htcmd ; do
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
+			-DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \
+			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
+			|| die "Compiling $f failed"
+	done
+	if use java; then
+		einfo "Compiling java files..."
+		cd java
+		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
+		cd "${S}/texmf/tex4ht/bin"
+		# Create the jar needed by oolatex
+		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+	fi
+}
+
+src_install () {
+	# install the binaries
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	# install the scripts
+	if ! use java; then
+		rm -f "${S}"/bin/unix/oo*
+		rm -f "${S}"/bin/unix/jh*
+	fi
+	dobin "${S}"/bin/unix/mk4ht || die
+
+	# install the .4ht scripts
+	insinto ${TEXMF}/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/* || die
+
+	# install the special htf fonts
+	insinto ${TEXMF}/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts" || die
+
+	if use java; then
+		# install the java files
+		doins -r "${S}/texmf/tex4ht/bin"
+		java-pkg_jarinto ${TEXMF}/tex4ht/bin
+		java-pkg_dojar "${S}/${PN}.jar"
+	fi
+
+	# install the .4xt files
+	doins -r "${S}/texmf/tex4ht/xtpipes" || die
+
+	# install the env file
+	insinto ${TEXMF}/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env || die
+
+	if latex-package_has_tetex_3 ; then
+		insinto /etc/texmf/texmf.d
+		doins "${FILESDIR}/50tex4ht.cnf" || die
+	fi
+
+	insinto ${TEXMF}/tex/generic/${PN}
+	insopts -m755
+	doins "${S}"/bin/ht/unix/* || die
+}
+
+pkg_postinst() {
+	use java ||	elog 'ODF converters (oolatex & friends) require the java use flag'
+	latex-package_pkg_postinst
+	elog "In order to avoid collisions with multiple packages"
+	elog "We are not installing the scripts in /usr/bin anymore"
+	elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'"
+}
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r4.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r4.ebuild
new file mode 100644
index 000000000000..ffa6960f3bba
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+TL_TEX4HT_VER=2015-08-03
+IUSE=""
+
+# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
+MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
+
+DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
+HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
+	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
+SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
+	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
+
+LICENSE="LPPL-1.2"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+
+DEPEND=">=sys-apps/sed-4
+	virtual/pkgconfig
+	dev-libs/kpathsea
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-gfx/imagemagick
+	dev-libs/kpathsea
+	java? ( >=virtual/jre-1.5 )"
+
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
+	cd "${S}/texmf/tex4ht/base/unix"
+	sed -i \
+		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
+		-e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \
+		-e "s#%%~/texmf-dist#${EPREFIX}${TEXMF}#g" \
+		-e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \
+		tex4ht.env \
+		|| die "sed of tex4ht.env failed"
+
+	einfo "Removing precompiled java stuff"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete
+}
+
+src_compile() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	cd "${S}/src/"
+	einfo "Compiling postprocessor sources..."
+	for f in tex4ht t4ht htcmd ; do
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
+			-DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \
+			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
+			|| die "Compiling $f failed"
+	done
+	if use java; then
+		einfo "Compiling java files..."
+		cd java
+		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
+		cd "${S}/texmf/tex4ht/bin"
+		# Create the jar needed by oolatex
+		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+	fi
+}
+
+src_install () {
+	# install the binaries
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	# install the scripts
+	if ! use java; then
+		rm -f "${S}"/bin/unix/oo*
+		rm -f "${S}"/bin/unix/jh*
+	fi
+	dobin "${S}"/bin/unix/mk4ht || die
+
+	# install the .4ht scripts
+	insinto ${TEXMF}/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/* || die
+
+	# install the special htf fonts
+	insinto ${TEXMF}/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts" || die
+
+	if use java; then
+		# install the java files
+		doins -r "${S}/texmf/tex4ht/bin"
+		java-pkg_jarinto ${TEXMF}/tex4ht/bin
+		java-pkg_dojar "${S}/${PN}.jar"
+	fi
+
+	# install the .4xt files
+	doins -r "${S}/texmf/tex4ht/xtpipes" || die
+
+	# install the env file
+	insinto ${TEXMF}/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env || die
+
+	if latex-package_has_tetex_3 ; then
+		insinto /etc/texmf/texmf.d
+		doins "${FILESDIR}/50tex4ht.cnf" || die
+	fi
+
+	insinto ${TEXMF}/tex/generic/${PN}
+	insopts -m755
+	doins "${S}"/bin/ht/unix/* || die
+}
+
+pkg_postinst() {
+	use java ||	elog 'ODF converters (oolatex & friends) require the java use flag'
+	latex-package_pkg_postinst
+	elog "In order to avoid collisions with multiple packages"
+	elog "We are not installing the scripts in /usr/bin anymore"
+	elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'"
+}
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
new file mode 100644
index 000000000000..c0cc47a97c16
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+TL_TEX4HT_VER=2017-02-05
+IUSE=""
+
+# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
+MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
+
+DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
+HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
+	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
+SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
+	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
+
+LICENSE="LPPL-1.2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+
+DEPEND=">=sys-apps/sed-4
+	virtual/pkgconfig
+	dev-libs/kpathsea
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-gfx/imagemagick
+	dev-libs/kpathsea
+	java? ( >=virtual/jre-1.5 )"
+
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
+	cd "${S}/texmf/tex4ht/base/unix"
+	sed -i \
+		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
+		-e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \
+		-e "s#%%~/texmf-dist#${EPREFIX}${TEXMF}#g" \
+		-e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \
+		tex4ht.env \
+		|| die "sed of tex4ht.env failed"
+
+	einfo "Removing precompiled java stuff"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete
+}
+
+src_compile() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	cd "${S}/src/"
+	einfo "Compiling postprocessor sources..."
+	for f in tex4ht t4ht htcmd ; do
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
+			-DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \
+			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
+			|| die "Compiling $f failed"
+	done
+	if use java; then
+		einfo "Compiling java files..."
+		cd java
+		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
+		cd "${S}/texmf/tex4ht/bin"
+		# Create the jar needed by oolatex
+		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+	fi
+}
+
+src_install () {
+	# install the binaries
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	# install the scripts
+	if ! use java; then
+		rm -f "${S}"/bin/unix/oo*
+		rm -f "${S}"/bin/unix/jh*
+	fi
+	dobin "${S}"/bin/unix/mk4ht || die
+
+	# install the .4ht scripts
+	insinto ${TEXMF}/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/* || die
+
+	# install the special htf fonts
+	insinto ${TEXMF}/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts" || die
+
+	if use java; then
+		# install the java files
+		doins -r "${S}/texmf/tex4ht/bin"
+		java-pkg_jarinto ${TEXMF}/tex4ht/bin
+		java-pkg_dojar "${S}/${PN}.jar"
+	fi
+
+	# install the .4xt files
+	doins -r "${S}/texmf/tex4ht/xtpipes" || die
+
+	# install the env file
+	insinto ${TEXMF}/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env || die
+
+	if latex-package_has_tetex_3 ; then
+		insinto /etc/texmf/texmf.d
+		doins "${FILESDIR}/50tex4ht.cnf" || die
+	fi
+
+	insinto ${TEXMF}/tex/generic/${PN}
+	insopts -m755
+	doins "${S}"/bin/ht/unix/* || die
+}
+
+pkg_postinst() {
+	use java ||	elog 'ODF converters (oolatex & friends) require the java use flag'
+	latex-package_pkg_postinst
+	elog "In order to avoid collisions with multiple packages"
+	elog "We are not installing the scripts in /usr/bin anymore"
+	elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'"
+}