version bump

7 files changed, 71 insertions, 104 deletions

diff --git a/app-text/latex2html/ChangeLog b/app-text/latex2html/ChangeLog
index 41c5463cebb3..1c2b191e1f7d 100644
--- a/app-text/latex2html/ChangeLog
+++ b/app-text/latex2html/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/latex2html
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/ChangeLog,v 1.5 2002/08/02 17:42:49 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/ChangeLog,v 1.6 2002/11/09 07:50:48 seemant Exp $
+
+*latex2html-2002.2 (08 Nov 2002)
+
+  08 Nov 2002; Seemant Kulleen <seemant@gentoo.org> latex2html-2002.2.ebuild
+  files/digest-latex2html-2002.2.ebuild :
+
+  Version bump, and fixed the problem in bug #10446 reported by:
+  twanger@bluetwanger.de (Markus Bertheau)
 
 *latex2html-2002.1 (18 Jun 2002)
 
diff --git a/app-text/latex2html/files/digest-latex2html-2000.1b b/app-text/latex2html/files/digest-latex2html-2000.1b
deleted file mode 100644
index e8e8eb9d5762..000000000000
--- a/app-text/latex2html/files/digest-latex2html-2000.1b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a0b34c1c5c69a4009605c8a0c309ff8 latex2html-2K.1beta.tar.gz 1072991
diff --git a/app-text/latex2html/files/digest-latex2html-2002 b/app-text/latex2html/files/digest-latex2html-2002
deleted file mode 100644
index 969767455001..000000000000
--- a/app-text/latex2html/files/digest-latex2html-2002
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72c2cb20526639cbf6ee2a66223c5cc2 latex2html-2002.tar.gz 1076902
diff --git a/app-text/latex2html/files/digest-latex2html-2002.2 b/app-text/latex2html/files/digest-latex2html-2002.2
new file mode 100644
index 000000000000..afdfd696e135
--- /dev/null
+++ b/app-text/latex2html/files/digest-latex2html-2002.2
@@ -0,0 +1 @@
+MD5 8604e7455f48f5fca126e600aa7b485f latex2html-2002-2.tar.gz 1122586
diff --git a/app-text/latex2html/latex2html-2000.1b.ebuild b/app-text/latex2html/latex2html-2000.1b.ebuild
deleted file mode 100644
index bfa6f9df8289..000000000000
--- a/app-text/latex2html/latex2html-2000.1b.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Michael Conrad Tilstra <tadpol@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/latex2html-2000.1b.ebuild,v 1.8 2002/10/04 05:06:26 vapier Exp $
-
-#darn weird naming...
-MY_P=${PN}-2K.1beta
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="LATEX2HTML is a convertor written in Perl that converts LATEX documents to HTML."
-SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${MY_P}.tar.gz"
-HOMEPAGE="http://www.latex2html.org"
-SLOT="0"
-LICENSE="as-is"
-
-DEPEND="virtual/glibc"
-KEYWORDS="x86 ppc sparc sparc64"
-RDEPEND="sys-devel/perl
-	app-text/ghostscript
-	media-libs/netpbm
-	app-text/tetex
-	"
-
-src_compile() {
-	econf || die
-	make || die
-	make check || die
-#	make test || die
-}
-
-src_install () {
-	# modify cfgcache.pm
-	[ -f cfgcache.pm.backup ] && mv cfgcache.pm.backup cfgcache.pm
-	cat cfgcache.pm | sed \
-		-e "/BINDIR/s:/usr/bin:${D}usr/bin:" \
-		-e "/LIBDIR/s:/usr/lib:${D}usr/lib:" \
-		-e "/TEXPATH/s:/usr/share:${D}usr/share:" \
-		-e '/MKTEXLSR/s:/usr/bin/mktexlsr::' > cfgcache.NEW
-	mv cfgcache.pm cfgcache.pm.backup
-	mv cfgcache.NEW cfgcache.pm
-	
-	dodir /usr/bin /usr/lib/latex2html /usr/share/texmf/tex/latex/html
-	make install || die
-
-	cp cfgcache.pm.backup ${D}/usr/lib/latex2html/cfgcache.pm
-	#Install docs
-	dodoc BUGS Changes FAQ INSTALL LICENSE MANIFEST README TODO
-}
-
-pkg_postinst() {
-	einfo "Running mktexlsr to rebuild ls-R database...."
-	mktexlsr
-}
-
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/latex2html/latex2html-2002.1.ebuild b/app-text/latex2html/latex2html-2002.1.ebuild
index a4b2334cd79a..19851de2693f 100644
--- a/app-text/latex2html/latex2html-2002.1.ebuild
+++ b/app-text/latex2html/latex2html-2002.1.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Michael Conrad Tilstra <tadpol@gentoo.org> <tadpol@tadpol.org>
-# /space/gentoo/cvsroot/gentoo-x86/app-text/latex2html/latex2html-2002.ebuild,v 1.1 2002/04/27 09:22:19 seemant Exp
+# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/latex2html-2002.1.ebuild,v 1.8 2002/11/09 07:50:48 seemant Exp $
 
 IUSE="gif png"
 
-P="latex2html-2002-1"
-S=${WORKDIR}/${P}
+MY_P=${P/./-}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="LATEX2HTML is a convertor written in Perl that converts LATEX documents to HTML."
-SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${P}.tar.gz"
+SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${MY_P}.tar.gz"
 HOMEPAGE="http://www.latex2html.org"
+
 SLOT="0"
 LICENSE="as-is"
-
-DEPEND="virtual/glibc"
 KEYWORDS="x86 ppc sparc sparc64"
 
+DEPEND="sys-apps/supersed"
+
 RDEPEND="app-text/ghostscript
 	app-text/tetex
 	media-libs/netpbm
 	sys-devel/perl
 	gif? ( media-libs/giflib
-	media-libs/libungif )
+		media-libs/libungif )
 	png? ( media-libs/libpng )"
 
-
 src_compile() {
 
 	local myconf
@@ -35,14 +34,14 @@ src_compile() {
 	use gif || use png || myconf="${myconf} --disable-images"
 
 	myconf="${myconf} \
-	--libdir=/usr/lib/latex2html \
-	--shlibdir=/usr/lib/latex2html \
-	--enable-pk \
-	--enable-eps \
-	--enable-reverse \
-	--enable-pipes \
-	--enable-paths \
-	--enable-wrapper"
+		--libdir=/usr/lib/latex2html \
+		--shlibdir=/usr/lib/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper"
 
 	econf ${myconf} || die
 	make || die
@@ -70,11 +69,16 @@ src_install () {
 	touch .keep
 	insinto /usr/share/latex2html
 	doins .keep
+
+	# clean the perl scripts up to remove references to the sandbox
+	einfo "fixing shit"
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/pstoimg.pl
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/latex2html.pl
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/cfgcache.pm
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/l2hconf.pm
 }
 
 pkg_postinst() {
 	einfo "Running mktexlsr to rebuild ls-R database...."
 	mktexlsr
 }
-
-
diff --git a/app-text/latex2html/latex2html-2002.ebuild b/app-text/latex2html/latex2html-2002.2.ebuild
index e60bd477baf4..c8e2781921e5 100644
--- a/app-text/latex2html/latex2html-2002.ebuild
+++ b/app-text/latex2html/latex2html-2002.2.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Michael Conrad Tilstra <tadpol@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/latex2html-2002.ebuild,v 1.6 2002/10/05 05:39:10 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/latex2html/latex2html-2002.2.ebuild,v 1.1 2002/11/09 07:50:48 seemant Exp $
 
 IUSE="gif png"
 
-S=${WORKDIR}/${P}
+MY_P=${P/./-}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="LATEX2HTML is a convertor written in Perl that converts LATEX documents to HTML."
-SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${P}.tar.gz"
+SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${MY_P}.tar.gz"
 HOMEPAGE="http://www.latex2html.org"
+
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc sparc sparc64"
-DEPEND="virtual/glibc"
+
+DEPEND="sys-apps/supersed"
 
 RDEPEND="app-text/ghostscript
 	app-text/tetex
@@ -21,16 +23,19 @@ RDEPEND="app-text/ghostscript
 	gif? ( media-libs/giflib
 		media-libs/libungif )
 	png? ( media-libs/libpng )"
-  
 
 src_compile() {
-	
+
 	local myconf
 
 	use gif && myconf="${myconf} --enable-gif"
 	use png && myconf="${myconf} --enable-png"
 
+	use gif || use png || myconf="${myconf} --disable-images"
+
 	myconf="${myconf} \
+		--libdir=/usr/lib/latex2html \
+		--shlibdir=/usr/lib/latex2html \
 		--enable-pk \
 		--enable-eps \
 		--enable-reverse \
@@ -44,30 +49,36 @@ src_compile() {
 }
 
 src_install () {
-	# modify cfgcache.pm
-	[ -f cfgcache.pm.backup ] && mv cfgcache.pm.backup cfgcache.pm
-	cat cfgcache.pm | sed \
-		-e "/BINDIR/s:/usr/bin:${D}usr/bin:" \
-		-e "/LIBDIR/s:/usr/share/lib:${D}usr/lib:" \
-		-e "/TEXPATH/s:/usr/share:${D}usr/share:" \
-		-e '/MKTEXLSR/s:/usr/bin/mktexlsr::' > cfgcache.NEW
-	mv cfgcache.pm cfgcache.pm.backup
-	mv cfgcache.NEW cfgcache.pm
-	
-	dodir /usr/bin /usr/lib/latex2html /usr/share/texmf/tex/latex/html
-	make \
-        LIBDIR=${D}/usr/lib/latex2html \
-        install || die
-
-	cp cfgcache.pm.backup ${D}/usr/lib/latex2html/cfgcache.pm
-	#Install docs
+
+	dodir /usr/bin /usr/lib/latex2html /usr/share/latex2html 
+	dodir /usr/share/texmf/tex/latex/html
+	cp cfgcache.pm cfgcache.pm.bak
+
+	# mktexlsr is run later to avoid a sandbox violation 
+	sed \
+		-e "/BINDIR\|LIBDIR\|SHLIBDIR\|TEXPATH/s#q'/#q'"${D}"#" \
+		-e "/MKTEXLSR/s:q'.*':q'':" \
+		cfgcache.pm.bak > cfgcache.pm
+
+	make install || die
+	cp cfgcache.pm.bak ${D}/usr/lib/latex2html/cfgcache.pm
+
 	dodoc BUGS Changes FAQ INSTALL LICENSE MANIFEST README TODO
+
+	# make /usr/share/latex2html sticky
+	touch .keep
+	insinto /usr/share/latex2html
+	doins .keep
+
+	# clean the perl scripts up to remove references to the sandbox
+	einfo "fixing shit"
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/pstoimg.pl
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/latex2html.pl
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/cfgcache.pm
+	ssed -i "s:${T}::g" ${D}/usr/lib/latex2html/l2hconf.pm
 }
 
 pkg_postinst() {
 	einfo "Running mktexlsr to rebuild ls-R database...."
 	mktexlsr
 }
-
-
-# vim: ai et sw=4 ts=4