Add small updates from TeX Live, by José Romildo Malaquias , bug #406045

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 550 insertions, 2 deletions

diff --git a/dev-tex/tex4ht/ChangeLog b/dev-tex/tex4ht/ChangeLog
index 607273c6f71a..0ab5a37853ea 100644
--- a/dev-tex/tex4ht/ChangeLog
+++ b/dev-tex/tex4ht/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tex/tex4ht
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.78 2012/07/25 14:18:20 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.79 2013/02/18 11:04:42 aballier Exp $
+
+*tex4ht-20090611_p1038-r2 (18 Feb 2013)
+
+  18 Feb 2013; Alexis Ballier <aballier@gentoo.org>
+  +files/tex4ht-texlive-updates.patch, +tex4ht-20090611_p1038-r2.ebuild:
+  Add small updates from TeX Live, by José Romildo Malaquias , bug #406045
 
   25 Jul 2012; Christoph Junghans <ottxor@gentoo.org>
   tex4ht-20090611_p1038-r1.ebuild:
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/tex4ht-20090611_p1038-r2.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r2.ebuild
new file mode 100644
index 000000000000..3efbf567060d
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/tex4ht-20090611_p1038-r2.ebuild,v 1.1 2013/02/18 11:04:42 aballier Exp $
+
+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'"
+}