Version bumped (bug #60835). Added 2.0.2-r4 to push out xdvi fix (bug #68883).

10 files changed, 133 insertions, 35 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index b29d99d564c0..ac6a54cdbd9c 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.67 2004/10/17 12:30:14 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.68 2004/10/28 11:58:22 usata Exp $
+
+*tetex-2.99.1.20041026 (28 Oct 2004)
+*tetex-2.0.2-r4 (28 Oct 2004)
+
+  28 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/tetex-2.96.7.20040721-dont-run-config.diff,
+  -files/tetex-2.96.7.20040721.diff,
+  +files/tetex-2.99.1.20041026-dont-run-config.diff,
+  +files/tetex-2.99.1.20041026-etex.diff, +files/tetex-2.99.1.20041026.diff,
+  +tetex-2.0.2-r4.ebuild, -tetex-2.96.7.20040721.ebuild,
+  +tetex-2.99.1.20041026.ebuild:
+  Version bumped (bug #60835). Added 2.0.2-r4 to push out xdvi fix(bug #68883).
 
 *tetex-2.96.7.20040721 (17 Oct 2004)
 
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index c6444d0200b3..d918b7bf62c4 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,14 +1,17 @@
-MD5 6f103aea98b1a7b4ee04c2e7d8e05491 ChangeLog 12215
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 835a85ca3e2f7b98f4e3e60990ff6e75 tetex-2.99.1.20041026.ebuild 1769
 MD5 62354ce0bb5f4a7c75033a8e46328e29 tetex-1.0.7-r13.ebuild 4765
-MD5 74dac6880bdd7cca3f73bfef47796ac3 tetex-2.96.7.20040721.ebuild 1221
+MD5 4a193e4eba590c87bf397eb7e7cb31cf tetex-2.0.2-r4.ebuild 574
+MD5 4df6fc3af4f19661544c7c974c828e13 ChangeLog 12723
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 303feae13db4c308164eb70310dc29d7 tetex-2.0.2-r3.ebuild 579
-MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
-MD5 41f87c91f8bb6ceeae3c1fb7ca0dce1c files/tetex-texdoctk-gentoo.patch 509
-MD5 7a4d3e500287b86cfbc6f823fe578867 files/digest-tetex-2.96.7.20040721 259
-MD5 aa62d1a50a39a89203f2a67cc2298986 files/tetex-2.96.7.20040721-dont-run-config.diff 1191
-MD5 f9d6a93c4e12ce629a2546034ef0e7ea files/tetex-2.96.7.20040721.diff 3002
-MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0.2-dont-run-config.diff 1243
 MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.2.diff 2010
+MD5 87457ae225528a6748f182b91b9b9c55 files/tetex-2.99.1.20041026.diff 3469
 MD5 7c6b2802aa5d3ea38bcc94a91c4ac54e files/digest-tetex-2.0.2-r3 214
+MD5 7c6b2802aa5d3ea38bcc94a91c4ac54e files/digest-tetex-2.0.2-r4 214
+MD5 2f002e0d1a982574956e4c15b1c7be07 files/digest-tetex-2.99.1.20041026 259
+MD5 41f87c91f8bb6ceeae3c1fb7ca0dce1c files/tetex-texdoctk-gentoo.patch 509
 MD5 1c3401dbbc9d478e94c98e44b9b68e38 files/tetex-no-readlink-manpage.diff 542
+MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
+MD5 a539912519440085cf04282e3593d5d0 files/tetex-2.99.1.20041026-etex.diff 484
+MD5 4d9d822ec737aaccae78dda20afa1b3f files/tetex-2.99.1.20041026-dont-run-config.diff 1755
+MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0.2-dont-run-config.diff 1243
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r4 b/app-text/tetex/files/digest-tetex-2.0.2-r4
new file mode 100644
index 000000000000..c26826e9812e
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r4
@@ -0,0 +1,3 @@
+MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
+MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
+MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
diff --git a/app-text/tetex/files/digest-tetex-2.96.7.20040721 b/app-text/tetex/files/digest-tetex-2.96.7.20040721
deleted file mode 100644
index 9d8075c780e6..000000000000
--- a/app-text/tetex/files/digest-tetex-2.96.7.20040721
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 16bc502d5270d79cab73a5f3f3ff1b63 tetex-src-beta-2.96.7.20040721.tar.gz 12419773
-MD5 a02189f0cb478272de17f24fbc6401ac tetex-texmf-beta-2.96.5.20040711.tar.gz 74362161
-MD5 235fcec50055fb4efd8370ddea2d56aa tetex-texmfsrc-beta-2.96.5.20040711.tar.gz 42285205
diff --git a/app-text/tetex/files/digest-tetex-2.99.1.20041026 b/app-text/tetex/files/digest-tetex-2.99.1.20041026
new file mode 100644
index 000000000000..9947199e0cef
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-2.99.1.20041026
@@ -0,0 +1,3 @@
+MD5 5f3d46a777ccb746c60e0d4b588c62bf tetex-src-beta-2.99.1.20041026.tar.gz 12565292
+MD5 099935025a9585b95b38a0ef1ac8278b tetex-texmf-beta-2.99.1.20041026.tar.gz 84068568
+MD5 a5d78bba13e3ace26e3baff80c62e6f3 tetex-texmfsrc-beta-2.99.1.20041026.tar.gz 55496190
diff --git a/app-text/tetex/files/tetex-2.96.7.20040721-dont-run-config.diff b/app-text/tetex/files/tetex-2.99.1.20041026-dont-run-config.diff
index e06ae347aaab..640100f00697 100644
--- a/app-text/tetex/files/tetex-2.96.7.20040721-dont-run-config.diff
+++ b/app-text/tetex/files/tetex-2.99.1.20041026-dont-run-config.diff
@@ -1,6 +1,6 @@
---- Makefile.in.bak	2004-09-03 00:50:00.917463912 +0900
-+++ Makefile.in	2004-09-03 00:50:00.920463456 +0900
-@@ -57,18 +57,18 @@
+--- Makefile.in.orig	2004-10-24 08:04:49.000000000 +0900
++++ Makefile.in	2004-10-28 01:01:06.638387175 +0900
+@@ -57,25 +57,25 @@
  	  cd texk/web2c/omegafonts; $(MAKE) install-links
  
  	$(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
@@ -16,6 +16,13 @@
 -	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
 -	    $(scriptdir)/texlinks; \
 -	else :; fi
+-	if test -f $(scriptdir)/updmap \
+-	  && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+-	       kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
+-	then \
+-	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+-	    $(scriptdir)/updmap; \
+-	else :; fi
 +	#if test -f $(scriptdir)/mktexlsr; then \
 +	#  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
 +	#    $(scriptdir)/mktexlsr; \
@@ -28,6 +35,13 @@
 +	#  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
 +	#    $(scriptdir)/texlinks; \
 +	#else :; fi
++	#if test -f $(scriptdir)/updmap \
++	#  && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++	#       kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
++	#then \
++	#  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++	#    $(scriptdir)/updmap; \
++	#else :; fi
  
  install-exec:
  	for dir in $(INSTDIRS); do \
diff --git a/app-text/tetex/files/tetex-2.99.1.20041026-etex.diff b/app-text/tetex/files/tetex-2.99.1.20041026-etex.diff
new file mode 100644
index 000000000000..5c42460aa7da
--- /dev/null
+++ b/app-text/tetex/files/tetex-2.99.1.20041026-etex.diff
@@ -0,0 +1,11 @@
+--- texk/web2c/etexdir/etex.mk.orig	2004-10-28 01:44:18.541833699 +0900
++++ texk/web2c/etexdir/etex.mk	2004-10-28 01:44:36.393095608 +0900
+@@ -23,7 +23,7 @@
+ # C file dependencies
+ $(etex_c) etexcoerce.h etexd.h: etex.p $(web2c_texmf)
+ 	$(web2c) etex
+-etexextra.c: lib/texmfmp.c
++etexextra.c: lib/texmfmp.c etexdir/etexextra.h
+ 	sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@
+ etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
+ 	test -d etexdir || mkdir etexdir
diff --git a/app-text/tetex/files/tetex-2.96.7.20040721.diff b/app-text/tetex/files/tetex-2.99.1.20041026.diff
index 1440428c5941..a67efe1aaaf2 100644
--- a/app-text/tetex/files/tetex-2.96.7.20040721.diff
+++ b/app-text/tetex/files/tetex-2.99.1.20041026.diff
@@ -1,12 +1,21 @@
 diff -urN tetex-src-beta-2.96.7.20040721.orig/texk/kpathsea/texmf.in tetex-src-beta-2.96.7.20040721/texk/kpathsea/texmf.in
 --- tetex-src-beta-2.96.7.20040721.orig/texk/kpathsea/texmf.in	2004-06-19 18:35:43.000000000 +0900
 +++ tetex-src-beta-2.96.7.20040721/texk/kpathsea/texmf.in	2004-09-03 01:00:44.002700096 +0900
-@@ -63,11 +63,11 @@
+@@ -56,18 +56,18 @@
+ 
+ % The tree containing the runtime files closely related to the specific
+ % program version used:
+-TEXMFMAIN = @texmf@
++TEXMFMAIN = /var/lib/texmf
+ 
+ % The main distribution tree:
+-TEXMFDIST = @texmf@-dist
++TEXMFDIST = /usr/share/texmf
  
  % A place for local additions to a "standard" texmf tree. If defined,
  % teTeX's texconfig also stores modified config files here:
 -TEXMFLOCAL = @texmf@-local
-+TEXMFLOCAL = /etc/texmf
++TEXMFLOCAL = /usr/local/share/texmf
  
  % If defined, teTeX's texconfig stores variable runtime data here
  % (instead of the TEXMFMAIN tree).
@@ -23,7 +32,7 @@ diff -urN tetex-src-beta-2.96.7.20040721.orig/texk/kpathsea/texmf.in tetex-src-b
 +TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$VARTEXMF,!!$TEXMFMAIN,!!$TEXMFDIST}
  
  % The system trees.  These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMFLOCAL:$TEXMFMAIN:$TEXMFDIST
+ SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
 @@ -87,7 +87,7 @@
  % Where generated fonts may be written.  This tree is used when the sources
  % were found in a system tree and either that tree wasn't writable, or the
@@ -40,31 +49,31 @@ diff -urN tetex-src-beta-2.96.7.20040721.orig/texk/web2c/fmtutil.in tetex-src-be
  
  # Change "tex.ini -> bplain.ini" and "- -> language.dat"
  # if you want babel support in tex:
--tex		tex		-		-8bit tex.ini
-+tex		tex		language.dat		-8bit bplain.ini
+-tex		tex		-		-translate-file=cp227.tcx tex.ini
++tex		tex		language.dat		-translate-file=cp227.tcx bplain.ini
  @ALEPH@aleph		aleph		-		*aleph.ini
- @PETEX@latex		pdfetex		language.dat	-8bit *latex.ini
- @PETEX@etex		pdfetex		language.def	-8bit *etex.ini
-@@ -52,11 +52,11 @@
+ @PETEX@latex		pdfetex		language.dat	-translate-file=cp227.tcx *latex.ini
+ @PETEX@etex		pdfetex		language.def	-translate-file=cp227.tcx *etex.ini
+@@ -53,11 +53,11 @@
  
  # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
  # if you want babel support in amstex:
--#! amstex	pdfetex		-		-8bit *amstex.ini
-+amstex			pdfetex		language.dat	-8bit *bamstex.ini
+-#! amstex	pdfetex		-		-translate-file=cp227.tcx *amstex.ini
++amstex	pdfetex		language.dat		-translate-file=cp227.tcx *bamstex.ini
  
  # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
  # if you want babel support in pdfamstex:
--#! pdfamstex	pdfetex			-	-8bit *pdfamstex.ini
-+pdfamstex	pdfetex			language.dat	-8bit *pdfbamstex.ini
+-#! pdfamstex	pdfetex			-	-translate-file=cp227.tcx *pdfamstex.ini
++pdfamstex	pdfetex			language.dat	-translate-file=cp227.tcx *pdfbamstex.ini
  
  # Context formats:
- #! cont-cz	pdfetex		cont-usr.tex	-8bit *cont-cz.ini
-@@ -93,7 +93,7 @@
+ #! cont-cz	pdfetex		cont-usr.tex	-translate-file=cp227.tcx *cont-cz.ini
+@@ -95,7 +95,7 @@
  
  # Change "eplain.ini -> ebplain.ini" and "- -> language.dat"
  # if you want babel support in eplain:
--#! eplain	pdfetex		-	-8bit *eplain.ini
-+eplain		pdfetex		language.dat		-8bit *ebplain.ini
+-#! eplain	pdfetex		-	-translate-file=cp227.tcx *eplain.ini
++eplain	pdfetex		language.dat	-translate-file=cp227.tcx *ebplain.ini
  
  
  # mptopdf utility
diff --git a/app-text/tetex/tetex-2.0.2-r4.ebuild b/app-text/tetex/tetex-2.0.2-r4.ebuild
new file mode 100644
index 000000000000..1785d3e2a95b
--- /dev/null
+++ b/app-text/tetex/tetex-2.0.2-r4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2004 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-r4.ebuild,v 1.1 2004/10/28 11:58:22 usata Exp $
+
+inherit tetex eutils flag-o-matic
+
+DESCRIPTION="a complete TeX distribution"
+HOMEPAGE="http://tug.org/teTeX/"
+
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 ppc-macos"
+IUSE=""
+
+src_unpack() {
+	tetex_src_unpack
+	epatch ${FILESDIR}/${PN}-no-readlink-manpage.diff
+}
+
+src_compile() {
+	use amd64 && replace-flags "-O3" "-O2"
+	tetex_src_compile
+}
diff --git a/app-text/tetex/tetex-2.96.7.20040721.ebuild b/app-text/tetex/tetex-2.99.1.20041026.ebuild
index afe8822f0478..d28bcd189cfe 100644
--- a/app-text/tetex/tetex-2.96.7.20040721.ebuild
+++ b/app-text/tetex/tetex-2.99.1.20041026.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.96.7.20040721.ebuild,v 1.1 2004/10/17 12:30:14 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.99.1.20041026.ebuild,v 1.1 2004/10/28 11:58:22 usata Exp $
 
 inherit tetex eutils flag-o-matic
 
-TETEX_TEXMF_PV=2.96.5.20040711
+#TETEX_TEXMF_PV=2.96.5.20040711
+TETEX_TEXMF_PV=${PV}
 S=${WORKDIR}/tetex-src-beta-${PV}
 
 TETEX_SRC="tetex-src-beta-${TETEX_SRC_PV:-${TETEX_PV}}.tar.gz"
@@ -20,7 +21,11 @@ SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
 	${SRC_PATH_TETEX}/${TETEX_TEXMF_SRC}"
 
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~ppc-macos"
-IUSE=""
+IUSE="motif lesstif Xaw3d"
+
+DEPEND="motif? ( lesstif? ( x11-libs/lesstif )
+		!lesstif? ( x11-libs/openmotif ) )
+	!motif? ( Xaw3d? ( x11-libs/Xaw3d ) )"
 
 pkg_setup() {
 	ewarn
@@ -32,8 +37,28 @@ pkg_setup() {
 	epause
 }
 
+src_unpack() {
+	tetex_src_unpack
+	epatch ${FILESDIR}/${P}-etex.diff
+}
+
 src_compile() {
 	use amd64 && replace-flags "-O3" "-O2"
+
+	if use motif ; then
+		if use lesstif ; then
+			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
+			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
+		fi
+		toolkit="motif"
+	elif use Xaw3d ; then
+		toolkit="xaw3d"
+	else
+		toolkit="xaw"
+	fi
+
+	TETEX_ECONF="--with-x-toolkit=${toolkit}"
+
 	tetex_src_compile
 }