Version bump. Remove files already provided by our latex installs, bug #240980. Install latex files to texmf-site. Apply patch from bug #143831 to avoid using obsolete functions.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.4 x86_64

5 files changed, 123 insertions, 6 deletions

diff --git a/dev-tex/latex2html/ChangeLog b/dev-tex/latex2html/ChangeLog
index 477acb597a9e..dba9be3c10f8 100644
--- a/dev-tex/latex2html/ChangeLog
+++ b/dev-tex/latex2html/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-tex/latex2html
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.41 2007/10/14 21:43:06 aballier Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.42 2008/10/31 22:02:46 aballier Exp $
+
+*latex2html-2008 (31 Oct 2008)
+
+  31 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  files/latex2html-convert-length.patch, +files/latex2html-destdir.patch,
+  +latex2html-2008.ebuild:
+  Version bump. Remove files already provided by our latex installs, bug
+  #240980. Install latex files to texmf-site. Apply patch from bug #143831
+  to avoid using obsolete functions.
 
   14 Oct 2007; Alexis Ballier <aballier@gentoo.org>
   latex2html-2002.2.1_pre20041025-r1.ebuild:
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 2caf2b305fcf..c5b7f85025c8 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -1,7 +1,20 @@
-AUX latex2html-convert-length.patch 1150 RMD160 29e9c8addbc8afe3fe1409b7d74bb4d67f382c4c SHA1 9347ffb21e01d9661787f0959ccbef60e92c2dcf SHA256 f1d05a3770498237e57a22c0b7a9a1a3ef0461acd3fac26db5f1842d5b0678da
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX latex2html-convert-length.patch 1148 RMD160 0f73d986180941697e4ee18d85b586247fc2d7e1 SHA1 67436ec0f2b7d3cca6312c00e4808907701ab5ee SHA256 aaf0e7b7ef3e37790da12fac5e92d87323c6f8041d7fd3c205ee3c96df83401e
+AUX latex2html-destdir.patch 703 RMD160 2b08bb440c4aacd3b23a05cb34d56597de8fd2a5 SHA1 eae4695aa812c927060004db9fd958c7a0d0d0b8 SHA256 e2dad7784064b12c17ba9530eb54f706d057c5b399538ee1928ca38005f860e1
 AUX latex2html-extract-major-version.patch 635 RMD160 5bfc884c149a19f9f3f3608b48e77c9106edd8e0 SHA1 8c3ff25c41f68e1cafe9ba580f3f38d8b1fa28f3 SHA256 265327a28fdbec750a32fc32999625ef254ec80736f170e645e1355d51df5c04
 AUX latex2html-perl_name.patch 445 RMD160 6f93bdc394f8c240542cd6a224864c3b4b27420d SHA1 3fd8480e23e3c06b8cb9876cc82a42b61e21386b SHA256 41dcf9d9b46691c34bddbae39faccbfeadf6beb2e19a4ac18af4a186758289c9
 DIST latex2html-2002-2-1+20041025.tar.gz 1124233 RMD160 3ee05b1016fe9aad0db45bbbda6bc76e58dc3c25 SHA1 386be87f40ccdd77d4ff9621e05551f00e4d16c8 SHA256 5bb9204992d03562345a4c0371fd0f9e65e0ac0b133a91ddb4a6bdb011d2ecae
+DIST latex2html-2008.tar.gz 1133054 RMD160 a95f06253d6fc8808ffedcad7edf8235194d7756 SHA1 5e0aa47572e0c13a4c5da51e963d5496be3f86e7 SHA256 59456815a3984250c295d3d5c46b85646038db8db2735cdc0d3780cf4da337ad
 EBUILD latex2html-2002.2.1_pre20041025-r1.ebuild 2906 RMD160 94b64452b903ce501ccbe5dcdc15c26bf003c62d SHA1 3d9304e87519981c6add4cbca9379b196e31ddd8 SHA256 910425e3066cf570bab80ce819762be48b31c36480a3cd92badd65bf9be8ce2d
-MISC ChangeLog 7614 RMD160 5b3fa9c57ea11e77a92effdb9d8491400e993577 SHA1 6809262dad56cf51dd12cd401e95328e314f8711 SHA256 ee5493f1f5f9174d6c342766efc7b5fb27ab4fe89bec4a5c7312dc73ac1e1359
+EBUILD latex2html-2008.ebuild 2382 RMD160 ccfa9a2ced67a23069879903305aefeb61bbb236 SHA1 e0bd91f45359395d84c27ab7e3ea6b61cc417bff SHA256 282b7caa343fe07fa3242f24c068f6b2505915f933f53eea8b46a1b4cd1c757b
+MISC ChangeLog 7985 RMD160 4802870120805b72ea61fae28a062a7c87eb3387 SHA1 ed56c7b27e5186512cde495f204a5be2f3251f65 SHA256 9609fcd525f4bf877302183c159779221bc3080eb75bcbd586e4e586026fe530
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkLgIwACgkQvFcC4BYPU0oJlgCghnu3X09aEvOu14jRG4Ne2o5t
+7X8AnjpQOmxoQiXbzwa4PC1/Cdeo30Dt
+=1BVq
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/latex2html/files/latex2html-convert-length.patch b/dev-tex/latex2html/files/latex2html-convert-length.patch
index 63506315d5c0..4171fd7c05e9 100644
--- a/dev-tex/latex2html/files/latex2html-convert-length.patch
+++ b/dev-tex/latex2html/files/latex2html-convert-length.patch
@@ -5,7 +5,7 @@
  }
  # should no longer be needed, as this is defined in latex2html.pin
 -if (undefined &convert_length) { sub convert_length {&convert_length_table(@_)} }
-+if (undefined (&convert_length)) { sub convert_length {&convert_length_table(@_)} }
++if (!defined (&convert_length)) { sub convert_length {&convert_length_table(@_)} }
  
  # Translates LaTeX column specifications to HTML. Again, Netscape
  # needs some extra work with its width attributes in the <td> tags.
@@ -16,7 +16,7 @@
  }
  # should no longer be needed, as this is defined in latex2html.pin
 -if (undefined &convert_length) { sub convert_length {&convert_length_table(@_)} }
-+if (undefined (&convert_length)) { sub convert_length {&convert_length_table(@_)} }
++if (!defined (&convert_length)) { sub convert_length {&convert_length_table(@_)} }
  
  # Translates LaTeX column specifications to HTML. Again, Netscape
  # needs some extra work with its width attributes in the <td> tags.
diff --git a/dev-tex/latex2html/files/latex2html-destdir.patch b/dev-tex/latex2html/files/latex2html-destdir.patch
new file mode 100644
index 000000000000..2d07beff449b
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-destdir.patch
@@ -0,0 +1,15 @@
+Index: latex2html-2008/config/install.pl
+===================================================================
+--- latex2html-2008.orig/config/install.pl
++++ latex2html-2008/config/install.pl
+@@ -372,7 +372,9 @@ foreach $item (sort keys %Install_items)
+ 
+ if($cfg{TEXPATH}) {
+   print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
+-  unless(mkpath($cfg{TEXPATH})) {
++  my $destdir = $cfg{TEXPATH};
++  $destdir = $ENV{'DESTDIR'}.$destdir if($ENV{'DESTDIR'});
++  unless(mkpath($destdir)) {
+   #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
+   #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
+   #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {
diff --git a/dev-tex/latex2html/latex2html-2008.ebuild b/dev-tex/latex2html/latex2html-2008.ebuild
new file mode 100644
index 000000000000..e6980d1a836a
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2008.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/latex2html-2008.ebuild,v 1.1 2008/10/31 22:02:46 aballier Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="convertor written in Perl that converts LATEX documents to HTML"
+SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${P}.tar.gz"
+HOMEPAGE="http://www.latex2html.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gif png"
+
+DEPEND="virtual/ghostscript
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-convert-length.patch"
+	epatch "${FILESDIR}/${PN}-perl_name.patch"
+	epatch "${FILESDIR}/${PN}-extract-major-version.patch"
+	epatch "${FILESDIR}/${PN}-destdir.patch"
+	# Dont install old url.sty and other files
+	# Bug #240980
+	rm -f texinputs/url.sty texinputs/latin9.def || die "failed to remove duplicate latex files"
+}
+
+src_compile() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf --libdir=/usr/$(get_libdir)/latex2html \
+		--shlibdir=/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath=/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf} || die "econf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc BUGS Changes FAQ LICENSE.orig MANIFEST README* TODO
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	einfo "fixing sandbox references"
+	dosed "s:${T}:/tmp:g" /usr/$(get_libdir)/latex2html/pstoimg.pl
+	dosed "s:${S}::g" /usr/$(get_libdir)/latex2html/latex2html.pl
+	dosed "s:${T}:/tmp:g" /usr/$(get_libdir)/latex2html/cfgcache.pm
+	dosed "s:${T}:/tmp:g" /usr/$(get_libdir)/latex2html/l2hconf.pm
+}
+
+pkg_postinst() {
+	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${ROOT}"usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${ROOT}"usr/bin/mktexlsr
+}