Make tetex-2 use system libtool so that evince is happy with libkpathsea. Closes bug #124134.

(Portage version: 2.1_pre4-r1)

6 files changed, 429 insertions, 5 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index 2833ea7c74ce..93450af4e6c8 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,12 +1,21 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.114 2006/02/28 12:25:59 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.115 2006/03/01 14:54:38 nattfodd Exp $
 
   28 Feb 2006; Martin Ehmsen <ehmsen@gentoo.org> +files/pst-circ.pro,
   tetex-3.0_p1-r2.ebuild:
   Added pst-circ.pro to /usr/share/texmf/dvips/pstricks thanks to
   Henning Gunther <der_eq@freenet.de>, bug #123714.
 
+*tetex-2.0.2-r9 (01 Mar 2006)
+
+  01 Mar 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/tetex-2.0.2-use-system-libtool.patch, tetex-2.0.2-r8.ebuild,
+  +tetex-2.0.2-r9.ebuild:
+  Make tetex-2 use the system libtool so it can build a shared version of
+  libkpathsea and evince is happy. Thanks to Patrick McLean for the patch.
+  Closes bug #124134.
+
   15 Feb 2006; Martin Ehmsen <ehmsen@gentoo.org> tetex-3.0_p1-r2.ebuild:
   Use virtualx eclass to fix make test, bug #69439.
 
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 68dcf5ba3bbf..de61e1f9d41e 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -10,6 +10,9 @@ SHA256 6c98bb9cfb053bd9cf0bb0fedb62459df5500fcb1c6e91d8625208574f4a773e files/di
 MD5 22d6dcce2ae5229c5ba109e6638041ef files/digest-tetex-2.0.2-r8 1030
 RMD160 2575064189200d3d022f6a39736291f7757a862e files/digest-tetex-2.0.2-r8 1030
 SHA256 6c98bb9cfb053bd9cf0bb0fedb62459df5500fcb1c6e91d8625208574f4a773e files/digest-tetex-2.0.2-r8 1030
+MD5 22d6dcce2ae5229c5ba109e6638041ef files/digest-tetex-2.0.2-r9 1030
+RMD160 2575064189200d3d022f6a39736291f7757a862e files/digest-tetex-2.0.2-r9 1030
+SHA256 6c98bb9cfb053bd9cf0bb0fedb62459df5500fcb1c6e91d8625208574f4a773e files/digest-tetex-2.0.2-r9 1030
 MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r3 202
 RMD160 08427683cdfb35ab4f41641292c1da5a8ce7e33d files/digest-tetex-3.0-r3 202
 SHA256 a9181a9a9613db5714c7b5dbfe6c39ab4a627fbc339c91d5f38b12dd3b50603d files/digest-tetex-3.0-r3 202
@@ -37,9 +40,15 @@ SHA256 5f6a525bb57f25a722178716e142a6555058903be0ce3944263b424896941126 files/te
 MD5 ce3900d8a86ef6eb7c20dc2d445f16ff files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
 RMD160 e91170dbe19f8f56706159349e55aac1f77d47bc files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
 SHA256 7a1787521bbffc0bf74e59e658bc5fc38916e7e10ee840e88b5357aa9096df4b files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
+MD5 a21513c6b029b3f0f37bb16264413d66 files/tetex-2.0.2-flex-compile.patch 4912
+RMD160 3c3cf51d4335c2540619e044da080c52e8321668 files/tetex-2.0.2-flex-compile.patch 4912
+SHA256 b42437b2484f0d7850b90678556ce22723947981310a01f0f2e80d2a9466ce46 files/tetex-2.0.2-flex-compile.patch 4912
 MD5 56e1062f89330aad64afa0208ea09b30 files/tetex-2.0.2-flex-unput.patch 498
 RMD160 834d9c73bcbd2cecedd51c31b38e742e6919b31f files/tetex-2.0.2-flex-unput.patch 498
 SHA256 40305736699ab42b68203b43483f669aee57b98dad5ee60eb05d19d8e5d7652d files/tetex-2.0.2-flex-unput.patch 498
+MD5 46d1f73ae09c17acf740e5f7de57bcec files/tetex-2.0.2-use-system-libtool.patch 15523
+RMD160 272ea8cbbdf8d56516d819036a56e5045caccef5 files/tetex-2.0.2-use-system-libtool.patch 15523
+SHA256 356293ef8f95b444dfa98d052aa3fd58f03d9baf916ce462b712fd1dfec81b8d files/tetex-2.0.2-use-system-libtool.patch 15523
 MD5 b15d18a85d673070c4b9ac48ebc586ed files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 RMD160 214286fa8333858a5627b8f88c6d540401ce2217 files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 SHA256 10f1987f03fc28d1cb5d13c090f0c508c1517c6acb02c65d91c93a0e8a01f683 files/tetex-3.0-epstopdf-wrong-rotation.patch 521
@@ -94,9 +103,12 @@ SHA256 404a9912c7fb70721fe7e90f814bae1a4cd682918c435832755bee4a74e309a2 tetex-1.
 MD5 d23509f8f5b49f9c22a26e4291cf7c2b tetex-2.0.2-r5.ebuild 1369
 RMD160 6ed6a47d392ad8ab274bb6c588fd824cc0ad9c96 tetex-2.0.2-r5.ebuild 1369
 SHA256 7121e81f954d7f55c4c47b5836d5a1bf54a4025ff771db07446983901e87d7f0 tetex-2.0.2-r5.ebuild 1369
-MD5 6e37ba67e0f56db692135e9214e4b518 tetex-2.0.2-r8.ebuild 1575
-RMD160 810eb9a549edac7b7dc745bf065bad32f8a374fb tetex-2.0.2-r8.ebuild 1575
-SHA256 30541015a3ad0b463c4a872a461839b3f4c2d28f7352eb63bd822dba5dd4f181 tetex-2.0.2-r8.ebuild 1575
+MD5 49ff28c6c30d4aa8d29cf708957fe867 tetex-2.0.2-r8.ebuild 1646
+RMD160 9dadc7c217faad4a430a03f6e8e88577fb5ce425 tetex-2.0.2-r8.ebuild 1646
+SHA256 3ff5cc7cd6d7a3451e5a47a34c4bc4b5b8530931a45386b3b06e2719d2a67204 tetex-2.0.2-r8.ebuild 1646
+MD5 e2d06e4529c7764424486afdfed055cd tetex-2.0.2-r9.ebuild 1736
+RMD160 9232ff8dab117d7a2b6b6cd3114c037b9789fa6b tetex-2.0.2-r9.ebuild 1736
+SHA256 027871e516537caf77a628d7f6b2eb46f54c563b02840cd2be0bdb30bbd3c80d tetex-2.0.2-r9.ebuild 1736
 MD5 6d84991ef4fd00210a9eb68fdb393bd8 tetex-3.0-r3.ebuild 1272
 RMD160 de9967ea3058a5e634cfd1d99d6b94e4255d9149 tetex-3.0-r3.ebuild 1272
 SHA256 f5c2932ab9a675fc6e7abc795470ca1c64a4f165cde5d2c249d3efcfe308f82f tetex-3.0-r3.ebuild 1272
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r9 b/app-text/tetex/files/digest-tetex-2.0.2-r9
new file mode 100644
index 000000000000..e95ce21e5e41
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r9
@@ -0,0 +1,12 @@
+MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
+RMD160 f32700bfe389c9c15a72344770c7abe2ee048c38 tetex-2.0.2-gentoo.tar.gz 1704
+SHA256 331ac072cf658c22b983b16439dc0e6f95cac0cc95f4d993fcb4bad883ea2622 tetex-2.0.2-gentoo.tar.gz 1704
+MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
+RMD160 9bbb274c0598547bcecb00ff48e459d41bc65e93 tetex-src-2.0.2.tar.gz 11745933
+SHA256 9f8a35b3abd293d71fa6785a4c3e6aa4fdaeff03ae71863ad5ec9e1a9fc087f5 tetex-src-2.0.2.tar.gz 11745933
+MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
+RMD160 ff88622c2d97416a4f67fbdf7a00d837af35d94e tetex-texmf-2.0.2.tar.gz 52424280
+SHA256 0d5c4adb7a72a33fffa9eeb5e3137e0094c912eafc45e358ca20cd9257f79f0d tetex-texmf-2.0.2.tar.gz 52424280
+MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
+RMD160 bc444152b2f45cf3c0a743f6416134e31e8635b4 tetex-texmfsrc-2.0.2.tar.gz 22909537
+SHA256 9348f10c9e95fdb5e9a9702956cfce38be42c48621fcfc6c9ae192363e08d267 tetex-texmfsrc-2.0.2.tar.gz 22909537
diff --git a/app-text/tetex/files/tetex-2.0.2-use-system-libtool.patch b/app-text/tetex/files/tetex-2.0.2-use-system-libtool.patch
new file mode 100644
index 000000000000..0e1e0e393fab
--- /dev/null
+++ b/app-text/tetex/files/tetex-2.0.2-use-system-libtool.patch
@@ -0,0 +1,336 @@
+diff -ur tetex-src-2.0.2-orig/texk/acklibtool.m4 tetex-src-2.0.2/texk/acklibtool.m4
+--- tetex-src-2.0.2-orig/texk/acklibtool.m4	1997-10-03 11:38:16.000000000 +0000
++++ tetex-src-2.0.2/texk/acklibtool.m4	2006-02-28 17:23:29.000000000 +0000
+@@ -13,12 +13,7 @@
+ # scan PATH.  For one thing, if we found it somewhere there, we couldn't
+ # use that directory to put the config file ... and that's what we need
+ # to do, to avoid having to configure in every subdirectory.
+-LIBTOOL=$ac_aux_dir/klibtool
+-AC_SUBST(LIBTOOL)
+-if test ! -r $LIBTOOL; then
+-  AC_MSG_ERROR([klibtool not in $ac_aux_dir, goodbye])
+-  exit 1
+-fi
++LIBTOOL=libtool
+ #
+ ## Argument parsing: we support --enable-shared and --enable-static.
+ AC_ARG_ENABLE(shared,
+diff -ur tetex-src-2.0.2-orig/texk/dviljk/Makefile.in tetex-src-2.0.2/texk/dviljk/Makefile.in
+--- tetex-src-2.0.2-orig/texk/dviljk/Makefile.in	2002-12-08 10:31:49.000000000 +0000
++++ tetex-src-2.0.2/texk/dviljk/Makefile.in	2006-02-28 20:18:24.000000000 +0000
+@@ -58,13 +58,13 @@
+ install-exec:
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
+ 	test ! -f $(program) \
+-	  || $(INSTALL_LIBTOOL_PROG) $(bindir) $(program)
++	  || $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+ 	test ! -f $(program2p) \
+-	  || $(INSTALL_LIBTOOL_PROG) $(bindir) $(program2p)
++	  || $(INSTALL_LIBTOOL_PROG) $(program2p) $(bindir)
+ 	test ! -f $(program4) \
+-	  || $(INSTALL_LIBTOOL_PROG) $(bindir) $(program4)
++	  || $(INSTALL_LIBTOOL_PROG) $(program4) $(bindir)
+ 	test ! -f $(program4l) \
+-	  || $(INSTALL_LIBTOOL_PROG) $(bindir) $(program4l)
++	  || $(INSTALL_LIBTOOL_PROG) $(program4l) $(bindir)
+ 	$(INSTALL_SCRIPT) $(srcdir)/dvihp $(scriptdir)/dvihp
+ 	rm -f $(bindir)/$(program6); $(LN) $(program4) $(bindir)/$(program6)
+ uninstall-exec:
+diff -ur tetex-src-2.0.2-orig/texk/dvipdfm/Makefile.in tetex-src-2.0.2/texk/dvipdfm/Makefile.in
+--- tetex-src-2.0.2-orig/texk/dvipdfm/Makefile.in	2003-02-16 01:03:45.000000000 +0000
++++ tetex-src-2.0.2/texk/dvipdfm/Makefile.in	2006-02-28 20:20:29.000000000 +0000
+@@ -50,8 +50,8 @@
+ 
+ install-exec:
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+-	$(INSTALL_LIBTOOL_PROG) $(bindir) $(program)
+-	$(INSTALL_LIBTOOL_PROG) $(bindir) ebb
++	$(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
++	$(INSTALL_LIBTOOL_PROG) ebb $(bindir)
+ 	$(INSTALL_SCRIPT) $(srcdir)/dvipdft $(bindir)
+ 
+ uninstall-exec:
+diff -ur tetex-src-2.0.2-orig/texk/dvipsk/Makefile.in tetex-src-2.0.2/texk/dvipsk/Makefile.in
+--- tetex-src-2.0.2-orig/texk/dvipsk/Makefile.in	2003-01-31 18:07:46.000000000 +0000
++++ tetex-src-2.0.2/texk/dvipsk/Makefile.in	2006-02-28 20:20:55.000000000 +0000
+@@ -73,7 +73,7 @@
+ 
+ install-exec: all
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir) $(fontdir)
+-	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ uninstall-exec:
+ 	for p in $(programs); do rm -f $(bindir)/$$p; done
+ 
+diff -ur tetex-src-2.0.2-orig/texk/etc/autoconf/acspecific.m4 tetex-src-2.0.2/texk/etc/autoconf/acspecific.m4
+--- tetex-src-2.0.2-orig/texk/etc/autoconf/acspecific.m4	2003-02-18 06:46:57.000000000 +0000
++++ tetex-src-2.0.2/texk/etc/autoconf/acspecific.m4	2006-02-28 19:20:16.000000000 +0000
+@@ -119,7 +119,7 @@
+ 
+ AC_DEFUN(AC_PROG_CXX,
+ [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
+-AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc)
++AC_CHECK_PROGS(CXX, $CCC g++ gcc CC cxx cc++ cl, gcc)
+ 
+ AC_PROG_CXX_WORKS
+ AC_PROG_CXX_GNU
+diff -ur tetex-src-2.0.2-orig/texk/gsftopk/Makefile.in tetex-src-2.0.2/texk/gsftopk/Makefile.in
+--- tetex-src-2.0.2-orig/texk/gsftopk/Makefile.in	2002-11-12 20:59:35.000000000 +0000
++++ tetex-src-2.0.2/texk/gsftopk/Makefile.in	2006-02-28 20:22:58.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ install-exec: $(program)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+-	$(INSTALL_LIBTOOL_PROG)  $(bindir) $(program)
++	$(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+ uninstall-exec:
+ 	rm -f $(bindir)/$(program)
+ 
+diff -ur tetex-src-2.0.2-orig/texk/kpathsea/Makefile.in tetex-src-2.0.2/texk/kpathsea/Makefile.in
+--- tetex-src-2.0.2-orig/texk/kpathsea/Makefile.in	2003-02-15 17:21:42.000000000 +0000
++++ tetex-src-2.0.2/texk/kpathsea/Makefile.in	2006-02-28 22:15:34.000000000 +0000
+@@ -33,10 +33,10 @@
+ library = kpathsea
+ 
+ # We want to compile almost everything with libtool ...
+-KPATHSEA_CC = $(LIBTOOL) compile "$(CC)"
++KPATHSEA_CC = $(LIBTOOL) --mode=compile "$(CC)"
+ .SUFFIXES: .lo
+ .c.lo:
+-	$(KPATHSEA_CC) $< $(ALL_CFLAGS)
++	$(KPATHSEA_CC) $(ALL_CFLAGS) $<
+ 
+ default all: kpsewhich kpsestat access readlink $(library).info manfiles
+ 
+@@ -52,15 +52,8 @@
+ readlink: readlink.o
+ 	$(link_command) readlink.o
+ 
+-$(kpathsea): $(objects) klibtool.version
+-	$(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects)
+-
+-# All the objects depend on the klibtool configuration file.
+-$(objects): ../klibtool.config
+-
+-# Create klibtool.version in the build tree
+-klibtool.version:
+-	$(LN) $(srcdir)/kpathsea.version $@
++$(kpathsea): $(objects)
++	$(LIBTOOL) --mode=link $(CC) $(objects) -rpath $(libdir) -o $@
+ 
+ # Make variable substitutions for paths.h.
+ texmf.cnf: texmf.in texmf.sed
+@@ -180,8 +173,8 @@
+ 	$(INSTALL_SCRIPT) $(srcdir)/mktexnam $(web2cdir)/mktexnam
+ 	$(INSTALL_DATA) $(srcdir)/mktexnam.opt $(web2cdir)/mktexnam.opt
+ 	$(INSTALL_SCRIPT) $(srcdir)/mktexupd $(web2cdir)/mktexupd
+-	$(INSTALL_LIBTOOL_LIBS) $(libdir) lib$(library).la
+-	$(INSTALL_LIBTOOL_PROG) $(bindir) kpsewhich
++	$(INSTALL_LIBTOOL_LIBS) lib$(library).la $(libdir)
++	$(INSTALL_LIBTOOL_PROG) kpsewhich $(bindir)
+ 	$(INSTALL_PROGRAM) kpsestat $(bindir)
+ 	$(INSTALL_PROGRAM) access $(bindir)
+ 	$(INSTALL_PROGRAM) readlink $(bindir)
+diff -ur tetex-src-2.0.2-orig/texk/kpathsea/configure tetex-src-2.0.2/texk/kpathsea/configure
+--- tetex-src-2.0.2-orig/texk/kpathsea/configure	2003-02-18 04:12:52.000000000 +0000
++++ tetex-src-2.0.2/texk/kpathsea/configure	2006-02-28 17:20:36.000000000 +0000
+@@ -1382,12 +1382,8 @@
+ # scan PATH.  For one thing, if we found it somewhere there, we couldn't
+ # use that directory to put the config file ... and that's what we need
+ # to do, to avoid having to configure in every subdirectory.
+-LIBTOOL=$ac_aux_dir/klibtool
++LIBTOOL="libtool"
+ 
+-if test ! -r $LIBTOOL; then
+-  { echo "configure: error: klibtool not in $ac_aux_dir, goodbye" 1>&2; exit 1; }
+-  exit 1
+-fi
+ #
+ ## Argument parsing: we support --enable-shared and --enable-static.
+ # Check whether --enable-shared or --disable-shared was given.
+Only in tetex-src-2.0.2/texk/kpathsea: tetex-2.0.2-use-system-libtool.patch
+diff -ur tetex-src-2.0.2-orig/texk/make/common.mk tetex-src-2.0.2/texk/make/common.mk
+--- tetex-src-2.0.2-orig/texk/make/common.mk	2003-01-24 19:22:12.000000000 +0000
++++ tetex-src-2.0.2/texk/make/common.mk	2006-02-28 19:32:46.000000000 +0000
+@@ -12,7 +12,7 @@
+ LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
+ 
+ # Kpathsea needs this for compiling, programs need it for linking.
+-LIBTOOL = $(kpathsea_srcdir_parent)/klibtool
++LIBTOOL = libtool
+ 
+ # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
+ # please don't change ALL_CPPFLAGS or ALL_CFLAGS.
+@@ -32,8 +32,8 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_LIBTOOL_LIBS = INSTALL_DATA='$(INSTALL_DATA)' $(LIBTOOL) install-lib
+-INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog
++INSTALL_LIBTOOL_LIBS = $(LIBTOOL) --mode=install $(INSTALL_DATA)
++INSTALL_LIBTOOL_PROG = $(LIBTOOL) --mode=install $(INSTALL_PROGRAM)
+ 
+ # Creating (symbolic) links.
+ LN = @LN_S@
+diff -ur tetex-src-2.0.2-orig/texk/make/programs.mk tetex-src-2.0.2/texk/make/programs.mk
+--- tetex-src-2.0.2-orig/texk/make/programs.mk	2001-10-27 10:21:12.000000000 +0000
++++ tetex-src-2.0.2/texk/make/programs.mk	2006-02-28 18:48:03.000000000 +0000
+@@ -15,5 +15,5 @@
+ 
+ # When we link with Kpathsea, have to take account that it might be a
+ # shared library, etc.
+-kpathsea_link = $(LIBTOOL) link $(link_command)
++kpathsea_link = $(LIBTOOL) --mode=link $(link_command)
+ # End of programs.mk.
+diff -ur tetex-src-2.0.2-orig/texk/makeindexk/Makefile.in tetex-src-2.0.2/texk/makeindexk/Makefile.in
+--- tetex-src-2.0.2-orig/texk/makeindexk/Makefile.in	2002-11-12 20:57:06.000000000 +0000
++++ tetex-src-2.0.2/texk/makeindexk/Makefile.in	2006-02-28 20:21:17.000000000 +0000
+@@ -20,7 +20,7 @@
+ 
+ install-exec: $(programs)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+-	$(INSTALL_LIBTOOL_PROG) $(bindir) $(program)
++	$(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+ 	$(INSTALL_SCRIPT) $(srcdir)/mkindex $(scriptdir)/mkindex
+ uninstall-exec:
+ 	cd $(bindir) && rm -f $(program)
+diff -ur tetex-src-2.0.2-orig/texk/odvipsk/Makefile.in tetex-src-2.0.2/texk/odvipsk/Makefile.in
+--- tetex-src-2.0.2-orig/texk/odvipsk/Makefile.in	2003-01-31 18:08:27.000000000 +0000
++++ tetex-src-2.0.2/texk/odvipsk/Makefile.in	2006-02-28 20:21:40.000000000 +0000
+@@ -61,7 +61,7 @@
+ 
+ install-exec: all
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
+-	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ uninstall-exec:
+ 	for p in $(programs); do rm -f $(bindir)/$$p; done
+ 
+diff -ur tetex-src-2.0.2-orig/texk/oxdvik/Makefile.in tetex-src-2.0.2/texk/oxdvik/Makefile.in
+--- tetex-src-2.0.2-orig/texk/oxdvik/Makefile.in	2003-02-02 18:53:12.000000000 +0000
++++ tetex-src-2.0.2/texk/oxdvik/Makefile.in	2006-02-28 20:21:52.000000000 +0000
+@@ -102,7 +102,7 @@
+ 
+ install-exec: $(program)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+-	for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(program); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ 	$(INSTALL_SCRIPT) $(srcdir)/oxdvi-sh $(scriptdir)/oxdvi
+ uninstall-exec:
+ 
+diff -ur tetex-src-2.0.2-orig/texk/ps2pkm/Makefile.in tetex-src-2.0.2/texk/ps2pkm/Makefile.in
+--- tetex-src-2.0.2-orig/texk/ps2pkm/Makefile.in	2002-11-12 20:59:14.000000000 +0000
++++ tetex-src-2.0.2/texk/ps2pkm/Makefile.in	2006-02-28 20:22:06.000000000 +0000
+@@ -36,7 +36,7 @@
+ 
+ install-exec: $(programs)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+-	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ uninstall-exec:
+ 	for p in $(programs); do rm -f $(bindir)/$$p; done
+ 
+diff -ur tetex-src-2.0.2-orig/texk/web2c/Makefile.in tetex-src-2.0.2/texk/web2c/Makefile.in
+--- tetex-src-2.0.2-orig/texk/web2c/Makefile.in	2003-02-01 16:51:16.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/Makefile.in	2006-02-28 20:06:08.000000000 +0000
+@@ -38,7 +38,7 @@
+ CXX = @CXX@
+ CXXLD = $(CXX)
+ cxx_link_command = $(CXXLD) -o $@ $(LDFLAGS)
+-kpathsea_cxx_link = $(LIBTOOL) link $(cxx_link_command)
++kpathsea_cxx_link = $(LIBTOOL) --mode=link $(cxx_link_command)
+ 
+ @MAINT@ifeq ($(CC), gcc)
+ @MAINT@XDEFS = -Wimplicit -Wreturn-type -Wcomment -Wformat
+@@ -581,7 +581,7 @@
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(texpooldir) \
+ 	  $(mfpooldir) $(mppooldir)
+ 	cd mpware && $(MAKE) $(install_makeargs) install-exec
+-	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ @OMEGA@	cd omegafonts && $(MAKE) $(install_makeargs) install-programs install-links
+ @OMEGA@	cd otps && $(MAKE) $(install_makeargs) install-programs
+ 
+diff -ur tetex-src-2.0.2-orig/texk/web2c/configure tetex-src-2.0.2/texk/web2c/configure
+--- tetex-src-2.0.2-orig/texk/web2c/configure	2003-02-21 14:49:42.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/configure	2006-02-28 19:19:21.000000000 +0000
+@@ -2807,7 +2807,7 @@
+   # First test whether the compiler works in a subshell, and if so,
+   # do it again in the main shell so we see the result.
+ (
+-  for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
++  for ac_prog in $CCC g++ gcc CC cxx cc++ cl
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -2952,7 +2952,7 @@
+ fi
+ 
+ ) && {
+-  for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
++  for ac_prog in $CCC g++ gcc CC cxx cc++ cl
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+diff -ur tetex-src-2.0.2-orig/texk/web2c/mpware/Makefile.in tetex-src-2.0.2/texk/web2c/mpware/Makefile.in
+--- tetex-src-2.0.2-orig/texk/web2c/mpware/Makefile.in	2001-12-15 19:30:18.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/mpware/Makefile.in	2006-02-28 20:05:21.000000000 +0000
+@@ -47,8 +47,8 @@
+ install-exec: $(programs)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
+ 	$(INSTALL_PROGRAM) newer $(bindir)/newer
+-	$(INSTALL_LIBTOOL_PROG) $(bindir) dmp
+-	$(INSTALL_LIBTOOL_PROG) $(bindir) mpto
++	$(INSTALL_LIBTOOL_PROG) dmp $(bindir)
++	$(INSTALL_LIBTOOL_PROG) mpto $(bindir)
+ 	$(INSTALL_SCRIPT) makempx $(scriptdir)/makempx
+ install-data:
+ 
+diff -ur tetex-src-2.0.2-orig/texk/web2c/omegadir/omega.mk tetex-src-2.0.2/texk/web2c/omegadir/omega.mk
+--- tetex-src-2.0.2-orig/texk/web2c/omegadir/omega.mk	2002-11-12 17:35:32.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/omegadir/omega.mk	2006-02-28 20:23:45.000000000 +0000
+@@ -117,7 +117,7 @@
+ # The actual binary executables and pool files.
+ install-omega-programs: $(omega_programs)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+-	for p in omega; do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ 	cd otps && $(MAKE) $(install_makeargs) install-programs
+ 	cd omegafonts && $(MAKE) $(install_makeargs) install-programs
+ 
+diff -ur tetex-src-2.0.2-orig/texk/web2c/omegafonts/Makefile.in tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in
+--- tetex-src-2.0.2-orig/texk/web2c/omegafonts/Makefile.in	2001-11-10 13:42:37.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in	2006-02-28 20:11:23.000000000 +0000
+@@ -53,7 +53,7 @@
+ 
+ install-programs: $(programs)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) 
+-	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ 
+ install-links: install-programs
+ 	for f in ""$(linked_programs); do \
+diff -ur tetex-src-2.0.2-orig/texk/web2c/otps/Makefile.in tetex-src-2.0.2/texk/web2c/otps/Makefile.in
+--- tetex-src-2.0.2-orig/texk/web2c/otps/Makefile.in	2000-06-20 22:27:56.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/otps/Makefile.in	2006-02-28 20:12:28.000000000 +0000
+@@ -36,7 +36,7 @@
+ 
+ install-programs: $(programs)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) 
+-	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ 	for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
+ 
+ Makefile: Makefile.in ../config.status
+diff -ur tetex-src-2.0.2-orig/texk/xdvik/Makefile.in tetex-src-2.0.2/texk/xdvik/Makefile.in
+--- tetex-src-2.0.2-orig/texk/xdvik/Makefile.in	2003-02-02 18:53:22.000000000 +0000
++++ tetex-src-2.0.2/texk/xdvik/Makefile.in	2006-02-28 20:23:59.000000000 +0000
+@@ -103,7 +103,7 @@
+ 
+ install-exec: $(program)
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+-	for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
++	for p in $(program); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ 	$(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog)
+ 	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
+ 	$(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
diff --git a/app-text/tetex/tetex-2.0.2-r8.ebuild b/app-text/tetex/tetex-2.0.2-r8.ebuild
index 446329b7f5f9..9396cda992d4 100644
--- a/app-text/tetex/tetex-2.0.2-r8.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r8.ebuild,v 1.10 2006/02/13 12:13:22 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r8.ebuild,v 1.11 2006/03/01 14:54:38 nattfodd Exp $
 
 inherit tetex-2 flag-o-matic
 
@@ -31,6 +31,8 @@ src_unpack() {
 	# bug 85404
 	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/${P}-epstopdf-wrong-rotation.patch
 
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/${P}-flex-compile.patch
+
 	# bug 118264
 	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
 
diff --git a/app-text/tetex/tetex-2.0.2-r9.ebuild b/app-text/tetex/tetex-2.0.2-r9.ebuild
new file mode 100644
index 000000000000..e5f1804073cf
--- /dev/null
+++ b/app-text/tetex/tetex-2.0.2-r9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r9.ebuild,v 1.1 2006/03/01 14:54:38 nattfodd Exp $
+
+inherit tetex-2 flag-o-matic
+
+DESCRIPTION="a complete TeX distribution"
+HOMEPAGE="http://tug.org/teTeX/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	tetex-2_src_unpack
+
+	# bug 75801
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
+	EPATCH_OPTS="-d ${S}/libs/xpdf -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl2-CAN-2004-1125.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-CAN-2005-0064.patch
+
+	# bug 122365
+	EPATCH_OPTS="-d ${WORKDIR}" epatch ${FILESDIR}/tetex-2.0.2-flex-unput.patch || die
+
+	#bug 115775
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p2" epatch ${FILESDIR}/xpdf-2.02pl1-CAN-2005-3191-3.patch
+
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xdvizilla.patch
+
+	# bug 85404
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/${P}-epstopdf-wrong-rotation.patch
+
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/${P}-flex-compile.patch
+
+	# bug 118264
+	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
+
+	# bug 80985
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/${P}-use-system-libtool.patch
+
+}
+
+src_compile() {
+	use amd64 && replace-flags "-O3" "-O2"
+	tetex_src_compile
+}
+
+src_install() {
+	insinto /usr/share/texmf/tex/latex/greek
+	doins ${FILESDIR}/iso-8859-7.def
+	tetex-2_src_install
+}