Added ptetex-3 patch. This will be masked until teTeX-3 official release.

7 files changed, 192 insertions, 100 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 7870e95709d8..3dffe4f3c460 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ptex
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.22 2004/10/30 08:03:57 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.23 2004/11/05 16:53:32 usata Exp $
+
+*ptex-3.1.4.20041026 (06 Nov 2004)
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/tetex-2.0.2-dont-run-config.diff, -files/tetex-2.0.2.diff,
+  ptex-3.1.4-r1.ebuild, +ptex-3.1.4.20041026.ebuild:
+  Added ptetex-3 patch. This will be masked until teTeX-3 official release.
 
   30 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> ptex-3.1.3-r1.ebuild,
   ptex-3.1.4-r1.ebuild:
diff --git a/app-text/ptex/Manifest b/app-text/ptex/Manifest
index 1d82ed1b1307..8db63d53fbab 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -1,11 +1,11 @@
-MD5 b38621684da3327b1bb588ffe657724f ChangeLog 3158
-MD5 d2fd604b88f163116f23670ca84b1815 metadata.xml 531
+MD5 ae10e61a7921d04c17b9cee8bcc9e0ef ptex-3.1.4-r1.ebuild 3034
 MD5 95ba87dcbb0a27aabd2fbcf1be40d9f7 ptex-3.1.3.ebuild 1882
 MD5 b5d3e3ffe96c2355d2c83d1f187b9912 ptex-3.1.3-r1.ebuild 3034
-MD5 ae10e61a7921d04c17b9cee8bcc9e0ef ptex-3.1.4-r1.ebuild 3034
+MD5 2e6625704b55fce6c67733b47c19cdc4 ptex-3.1.4.20041026.ebuild 4752
+MD5 3be98d681aea98ba63df07d0b0a54b52 ChangeLog 3441
+MD5 d2fd604b88f163116f23670ca84b1815 metadata.xml 531
 MD5 75b6015c4ec058f264eb767326626843 files/digest-ptex-3.1.3 484
-MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
-MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0.2-dont-run-config.diff 1243
-MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.2.diff 2010
 MD5 3cbdb92af75d2424acadf9037f0f8977 files/digest-ptex-3.1.3-r1 718
 MD5 424cf5900fe6b1af9867cd2e8c952292 files/digest-ptex-3.1.4-r1 718
+MD5 e92d37a7194d0412dddad7a7f543e3b0 files/digest-ptex-3.1.4.20041026 317
+MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
diff --git a/app-text/ptex/files/digest-ptex-3.1.4.20041026 b/app-text/ptex/files/digest-ptex-3.1.4.20041026
new file mode 100644
index 000000000000..902d479ed8ea
--- /dev/null
+++ b/app-text/ptex/files/digest-ptex-3.1.4.20041026
@@ -0,0 +1,4 @@
+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 39b4038606f813f5f575d6817be95c97 ptetex3-20041027.tar.gz 2904987
+MD5 97b0444abc22e96521ea94a33b8f5165 tetex-2.99.1.20041026-gentoo.tar.gz 2252
diff --git a/app-text/ptex/files/tetex-2.0.2-dont-run-config.diff b/app-text/ptex/files/tetex-2.0.2-dont-run-config.diff
deleted file mode 100644
index 6ab71bc5b229..000000000000
--- a/app-text/ptex/files/tetex-2.0.2-dont-run-config.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.in.orig	2003-01-13 00:34:32.000000000 -0600
-+++ Makefile.in	2003-01-13 00:35:42.000000000 -0600
-@@ -59,18 +59,18 @@
- 	done
- 	$(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
- 	cd $(bindir); for i in $(ALLPROGS); do test -f $$i && echo strip $$i && strip $$i || true; done
--	if test -f $(scriptdir)/mktexlsr; then \
--	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
--	    $(scriptdir)/mktexlsr; \
--	else :; fi
--	if test -f $(scriptdir)/fmtutil; then \
--	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
--	    $(scriptdir)/fmtutil --all; \
--	else :; fi
--	if test -f $(scriptdir)/texlinks; then \
--	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
--	    $(scriptdir)/texlinks; \
--	else :; fi
-+	#if test -f $(scriptdir)/mktexlsr; then \
-+	#  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+	#    $(scriptdir)/mktexlsr; \
-+	#else :; fi
-+	#if test -f $(scriptdir)/fmtutil; then \
-+	#  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+	#    $(scriptdir)/fmtutil --all; \
-+	#else :; fi
-+	#if test -f $(scriptdir)/texlinks; then \
-+	#  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+	#    $(scriptdir)/texlinks; \
-+	#else :; fi
- 
- install-exec:
- 	for dir in $(ESUBDIRS); do \
diff --git a/app-text/ptex/files/tetex-2.0.2.diff b/app-text/ptex/files/tetex-2.0.2.diff
deleted file mode 100644
index cc9f775e0e67..000000000000
--- a/app-text/ptex/files/tetex-2.0.2.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru tetex-src-2.0-orig/texk/kpathsea/texmf.in tetex-src-2.0/texk/kpathsea/texmf.in
---- tetex-src-2.0-orig/texk/kpathsea/texmf.in	2003-01-19 05:58:27.000000000 -0600
-+++ tetex-src-2.0/texk/kpathsea/texmf.in	2003-02-05 20:17:16.000000000 -0600
-@@ -58,7 +58,7 @@
- TEXMFMAIN = @texmf@
- 
- % A place for local additions to a "standard" texmf tree.  For example:
--TEXMFLOCAL = @texmf@-local
-+TEXMFLOCAL = /usr/local/share/texmf
- 
- % If defined, teTeX's texconfig stores modifications here (instead of the
- % TEXMFMAIN tree).
-diff -ru tetex-src-2.0-orig/texk/web2c/fmtutil.in tetex-src-2.0/texk/web2c/fmtutil.in
---- tetex-src-2.0-orig/texk/web2c/fmtutil.in	2003-01-26 16:24:30.000000000 -0600
-+++ tetex-src-2.0/texk/web2c/fmtutil.in	2003-02-05 20:17:44.000000000 -0600
-@@ -39,7 +39,7 @@
- 
- # Change "tex.ini -> bplain.ini" and "- -> language.dat"
- # if you want babel support in tex:
--tex		@TEXBIN@		-		tex.ini
-+tex		@TEXBIN@		language.dat		bplain.ini
- # Change "tex -> etex" and "latex.ini -> *latex.ini" to get an
- # eTeX-2 enabled LaTeX format named latex. Or, don't change anything
- # and use elatex which is just the same.
-@@ -48,7 +48,7 @@
- @ETEX@elatex		etex		language.dat	*elatex.ini
- # Change "pdftex.ini -> pdfbplain.ini" and "- -> language.dat"
- # if you want babel support in pdftex:
--@PTEX@pdftex		pdftex		-	pdftex.ini
-+@PTEX@pdftex		pdftex		language.dat	pdfbplain.ini
- @PTEX@pdflatex	pdftex		language.dat	pdflatex.ini
- @PETEX@pdfetex		pdfetex		language.def	*pdfetex.ini
- @PETEX@pdfelatex	pdfetex		language.dat	*pdfelatex.ini
-@@ -59,11 +59,11 @@
- 
- # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
- # if you want babel support in amstex:
--#! amstex	@TEXBIN@		-		amstex.ini
-+ amstex	@TEXBIN@		language.dat		bamstex.ini
- 
- # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
- # if you want babel support in pdfamstex:
--#! pdfamstex	pdftex			-	pdfamstex.ini
-+ pdfamstex	pdftex			language.dat	pdfbamstex.ini
- 
- # Context formats:
- #! cont-cz	pdfetex		cont-usr.tex	*cont-cz.ini
diff --git a/app-text/ptex/ptex-3.1.4.20041026.ebuild b/app-text/ptex/ptex-3.1.4.20041026.ebuild
new file mode 100644
index 000000000000..38eb22f34c22
--- /dev/null
+++ b/app-text/ptex/ptex-3.1.4.20041026.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.4.20041026.ebuild,v 1.1 2004/11/05 16:53:32 usata Exp $
+
+TETEX_PV=2.99.1.20041026
+TEXMF_PATH=/var/lib/texmf
+
+inherit tetex eutils
+
+DESCRIPTION="The ASCII publishing TeX distribution"
+HOMEPAGE="http://www.ascii.co.jp/pb/ptex/
+	http://www.misojiro.t.u-tokyo.ac.jp/~tutimura/ptetex3/0README
+	http://www.fsci.fuk.kindai.ac.jp/aftp/pub/ptex/utils/"
+
+PTEX_TEXMF_PV=2.2
+PTEX_SRC="ptex-src-${PV%.*}b.tar.gz"
+PTEX_TEXMF="ptex-texmf-${PTEX_TEXMF_PV}.tar.gz"
+PTETEX=ptetex3-20041027
+
+S=${WORKDIR}/tetex-src-beta-${TETEX_PV}
+
+SRC_PATH_PTEX="ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex"
+SRC_PATH_TETEX="ftp://cam.ctan.org/tex-archive/systems/unix/teTeX-beta"
+TETEX_SRC="tetex-src-beta-${TETEX_PV}.tar.gz"
+TETEX_TEXMF="tetex-texmf-beta-${TETEX_PV}.tar.gz"
+TETEX_TEXMF_SRC=""
+SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
+	${SRC_PATH_TETEX}/${TETEX_TEXMF}
+	http://www.misojiro.t.u-tokyo.ac.jp/~tutimura/ptetex3/${PTETEX}.tar.gz
+	mirror://gentoo/tetex-${TETEX_PV}-gentoo.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~ppc ~sparc ~ppc64 ~ppc-macos"
+IUSE="X motif lesstif Xaw3d"
+
+DEPEND="X? ( >=media-libs/freetype-2
+		>=media-fonts/kochi-substitute-20030809-r3
+		motif? ( lesstif? ( x11-libs/lesstif )
+			!lesstif? ( x11-libs/openmotif ) )
+		!motif? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!app-text/xdvik
+	)"
+
+src_unpack() {
+	unpack ${PTETEX}.tar.gz
+	tetex_src_unpack
+
+	einfo "Unpacking pTeX sources ..."
+	cd ${S}/texmf
+	echo ">>> Unpacking ${PTEX_TEXMF} to ${S}/texmf ..."
+	tar xzf ${WORKDIR}/${PTETEX}/archive/${PTEX_TEXMF} || die
+
+	cd ${S}/texk/web2c
+	echo ">>> Unpacking ${PTEX_SRC} to ${S}/texk/web2c ..."
+	tar xzf ${WORKDIR}/${PTETEX}/archive/${PTEX_SRC} || die
+
+	cd ${S}/texk
+	echo ">>> Unpacking dvipsk-jpatch to ${S}/texk ..."
+	tar xzf ${WORKDIR}/${PTETEX}/archive/dvipsk-5.94b-p1.6a.tar.gz || die
+	epatch dvipsk-5.94b-p1.6a.diff
+
+	if use X ; then
+		cd ${S}
+		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-22.84.4-tetex-20040628-jp.diff.gz
+		cat >>${S}/texk/xdvik/vfontmap.sample<<-EOF
+
+		# TrueType fonts
+		min     /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+		nmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+		goth    /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+		tmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+		tgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+		ngoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+		jis     /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+		jisg    /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+		dm      /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+		dg      /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+		mgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+		fmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+		fgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+		EOF
+	fi
+}
+
+src_compile() {
+	if use X ; then
+		export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
+
+		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-vflib=vf2ft --enable-freetype --with-x-toolkit=${toolkit}"
+	fi
+
+	tetex_src_compile
+
+	cat >>${S}/texk/web2c/fmtutil.cnf<<-EOF
+
+	# Japanese pLaTeX:
+	ptex		ptex	-		ptex.ini
+	platex		ptex	language.dat	platex.ini
+	platex209	ptex	language.dat	plplain.ini
+	EOF
+
+	cat >>${S}/texk/web2c/texmf.cnf<<-EOF
+
+	CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/usr/share/xpdf//
+	EOF
+
+	# make ptex.tex visible to ptex
+	TEXMF="${S}/texmf" ${S}/texk/kpathsea/mktexlsr || die
+
+	cd ${S}/texk/web2c/${PTEX_SRC%.tar.gz} || die
+	chmod +x configure
+	./configure EUC || die "configure pTeX failed"
+
+	make || die "make pTeX failed"
+}
+
+src_install() {
+	tetex_src_install base doc fixup
+
+	einfo "Installing pTeX ..."
+	dodir ${D}${TEXMF_PATH}/web2c
+	cd ${S}/texk/web2c/${PTEX_SRC%.tar.gz} || die
+	einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH} || die
+
+	insinto /usr/share/texmf/fonts/map/dvips/tetex
+	doins ${FILESDIR}/psfonts-ja.map || die
+
+	cat >>${D}/${TEXMF_PATH}/web2c/updmap.cfg<<-EOF
+
+	# Japanese fonts
+	MixedMap psfonts-ja.map
+	EOF
+
+	# ptex reinstalls ${TEXMF_PATH}/web2c
+	tetex_src_install link
+
+	docinto dvipsk
+	cd ${S}/texk/dvipsk
+	dodoc ../ChangeLog.jpatch ../README.jpatch
+
+	if use X ; then
+		cd ${S}/texk/xdvik
+		docinto xdvik
+		dodoc ANNOUNCE BUGS CHANGES.xdvik-jp FAQ README.*
+		docinto xdvik/READMEs
+		dodoc READMEs/*
+	fi
+}
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index cc8d68e183ca..56158fbfc101 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,21 +1,21 @@
-MD5 7e48e95d76336b5344d745fe3e5d5912 ChangeLog 6917
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 9f80037668ee21ff1e8772317ca8f6a0 xpdf-2.03.ebuild 1154
 MD5 6dd4db69399ea021171a0c490a2cd8c5 xpdf-3.00-r1.ebuild 978
-MD5 bef529ecba71098065eee2e36263c067 xpdf-3.00-r4.ebuild 3212
-MD5 abfa980b68afcfce4c61d27b33408544 xpdf-3.00-r5.ebuild 3248
-MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61
-MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61
+MD5 faf07855a048a3e2db77fbe0f906e391 xpdf-3.00-r5.ebuild 3298
+MD5 9f80037668ee21ff1e8772317ca8f6a0 xpdf-2.03.ebuild 1154
+MD5 99674688aa0dc82894c5707cffde1252 xpdf-3.00-r4.ebuild 3259
+MD5 101e33b45fca615778bc8ed4e67ce2a2 ChangeLog 7065
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 8221707abac9c48b486b8c2b9bc7a7a0 files/xpdf-3.00-empty-bookmark.patch 373
-MD5 1ca86139c360680d756c771b7c6c8647 files/xpdf-3.00-freetype-2.1.7.patch 2743
+MD5 a21a0caeb7356fb3e68e5db195a505e9 files/xpdfrc.1 1587
 MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049
 MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288
+MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61
+MD5 37f0b42aad269cb5896773b47b1d83ac files/xpdf-3.00-truetype-new.diff.gz 1271
+MD5 1ca86139c360680d756c771b7c6c8647 files/xpdf-3.00-freetype-2.1.7.patch 2743
 MD5 7c0787e730fecfb5b6ebc5a7a69cd64e files/xpdfrc 1092
-MD5 263f91efedaa87e4597ab0a83407137d files/xpdfrc.1 1593
-MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r4 767
-MD5 41c050cd5c7ccdcf1676a6852c7a35ed files/xpdf-3.00-PathScanner.patch.bz2 1003
 MD5 3df9058a9971c09627e71dad6b056244 files/xpdf-3.00-core.patch.bz2 271
 MD5 c3d50c3fb232fe51c2ae06ff1f530d49 files/xpdf-3.00-overflow.patch.bz2 2097
-MD5 37f0b42aad269cb5896773b47b1d83ac files/xpdf-3.00-truetype-new.diff.gz 1271
-MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r5 767
+MD5 41c050cd5c7ccdcf1676a6852c7a35ed files/xpdf-3.00-PathScanner.patch.bz2 1003
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61
+MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r4 767
+MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r5 767