Version bumped.

11 files changed, 43 insertions, 329 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index a2f67f1a45af..b8306780e278 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,16 +1,25 @@
 # ChangeLog for app-text/ptex
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.29 2005/01/20 20:07:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.30 2005/01/21 11:40:29 usata Exp $
+
+*ptex-3.1.8.20050111 (21 Jan 2005)
+*ptex-3.1.5 (21 Jan 2005)
+
+  21 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> -ptex-3.1.3-r1.ebuild,
+  -ptex-3.1.4-r1.ebuild, -ptex-3.1.4.20041109-r1.ebuild,
+  -ptex-3.1.4.20041109.ebuild, +ptex-3.1.5.ebuild,
+  +ptex-3.1.8.20050111.ebuild:
+  Version bumped.
 
   20 Jan 2005; Markus Rothe <corsair@gentoo.org> ptex-3.1.4-r2.ebuild:
   Stable on ppc64; bug #75801
 
-  20 Jan 2005; Olivier Crête <tester@gentoo.org> ptex-3.1.4-r2.ebuild:
+  20 Jan 2005; Olivier Cr?te <tester@gentoo.org> ptex-3.1.4-r2.ebuild:
   Stable on x86 wrt security bug #75801
 
 *ptex-3.1.4-r2 (20 Jan 2005)
 
-  20 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> ptex-3.1.4-r2.ebuild:
+  20 Jan 2005; Bryan ?stergaard <kloeri@gentoo.org> ptex-3.1.4-r2.ebuild:
   Stable on alpha, bug 75801.
 
 *ptex-3.1.4.20041109-r1 (21 Nov 2004)
diff --git a/app-text/ptex/Manifest b/app-text/ptex/Manifest
index 62cc0365980e..55818330f42b 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -1,23 +1,21 @@
 MD5 01d099456b0d5d84983a6f5278a5f152 ChangeLog 4306
 MD5 d2fd604b88f163116f23670ca84b1815 metadata.xml 531
-MD5 b9e808caac2506e56403d3e3ae4dceb4 ptex-3.1.3-r1.ebuild 3039
-MD5 1211f37d7142ad93737b08e4da0c1b97 ptex-3.1.3.ebuild 1887
-MD5 c811cc83f83eb8f3ecce9b19ddfb2c1e ptex-3.1.4-r1.ebuild 3039
 MD5 eeac4f3f89986b2a78bf753f8e9d16f0 ptex-3.1.4.20041109-r1.ebuild 4759
-MD5 ea4119bed244b4a3ea4c37c8aeced41c ptex-3.1.4.20041109.ebuild 4854
+MD5 83415d81657c4a2db786e64afaf50acb ptex-3.1.5.ebuild 3552
+MD5 1211f37d7142ad93737b08e4da0c1b97 ptex-3.1.3.ebuild 1887
 MD5 6ab6c6a87e4851f77e1a6af6196b43f7 ptex-3.1.4-r2.ebuild 3549
-MD5 75b6015c4ec058f264eb767326626843 files/digest-ptex-3.1.3 484
-MD5 3cbdb92af75d2424acadf9037f0f8977 files/digest-ptex-3.1.3-r1 718
-MD5 4d1956517ccb98e9be75cdf83f9b7ac0 files/20fmtutil-platex.cnf 121
-MD5 424cf5900fe6b1af9867cd2e8c952292 files/digest-ptex-3.1.4-r1 718
-MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
+MD5 80ba7640a134e19fa4ebe3697b849c9f ptex-3.1.8.20050111.ebuild 4759
 MD5 a1829990d625a3607cc38b99a27b9574 files/20texmf-cmap.cnf 65
-MD5 d4d469b2a8b88c4d97440979fd5c2a41 files/20updmap-ja.cfg 43
-MD5 04ffb231db607a3a8ce7168600fee9b1 files/digest-ptex-3.1.4.20041109 317
-MD5 04ffb231db607a3a8ce7168600fee9b1 files/digest-ptex-3.1.4.20041109-r1 317
+MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
+MD5 ea102290ac2dc97ad73dc4cc02635d9c files/digest-ptex-3.1.8.20050111 317
+MD5 3e6bd16aa42a2c0f77d9ea14dabb96f3 files/digest-ptex-3.1.5 718
+MD5 4d1956517ccb98e9be75cdf83f9b7ac0 files/20fmtutil-platex.cnf 121
+MD5 75b6015c4ec058f264eb767326626843 files/digest-ptex-3.1.3 484
 MD5 424cf5900fe6b1af9867cd2e8c952292 files/digest-ptex-3.1.4-r2 718
 MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
 MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
+MD5 d4d469b2a8b88c4d97440979fd5c2a41 files/20updmap-ja.cfg 43
+MD5 04ffb231db607a3a8ce7168600fee9b1 files/digest-ptex-3.1.4.20041109-r1 317
 MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-CAN-2005-0064.patch 346
 MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
diff --git a/app-text/ptex/files/digest-ptex-3.1.4-r1 b/app-text/ptex/files/digest-ptex-3.1.4-r1
deleted file mode 100644
index b57769814eb6..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
-MD5 ffdcb5b304f3014077bfc227343e2ef1 ptex-src-3.1.4.tar.gz 121053
-MD5 9171f289677684d97f28e95026e75426 ptex-texmf-2.2.tar.gz 1866278
-MD5 cf7c5744c27d585384e414cf3e5ca4cd dvipsk-jpatch-p1.6a.tar.gz 29428
-MD5 291f5bd0cb68f2bcfdc289cdff24dd84 tetex-src-2.0.2-xdvik-y1.patch.gz 16294
-MD5 f1ab77fcd0bbc54415b88ce7d6ad557c tetex-src-2.0.2-xdvik-y1-j1.19.patch.gz 10936
-MD5 9ce0615764079502f3b76692127a068a xdvik-22.40y1-j1.21.patch.gz 166908
diff --git a/app-text/ptex/files/digest-ptex-3.1.4.20041109 b/app-text/ptex/files/digest-ptex-3.1.4.20041109
deleted file mode 100644
index 9a63320bdc22..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.4.20041109
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 d7a93c0405afadf8660f4c6f074e439e tetex-src-2.99.3.20041109-beta.tar.gz 12577686
-MD5 b70a6babed0dbe0fae83ce22602eb617 tetex-texmf-2.99.3.20041109-beta.tar.gz 84347101
-MD5 5668cecaa35eb13a4a1b81adc65faa97 ptetex3-20041118.tar.gz 2912158
-MD5 159f9f394af55d6d402431f71817ab09 tetex-2.99.3.20041109-gentoo.tar.gz 1831
diff --git a/app-text/ptex/files/digest-ptex-3.1.4.20041109-r1 b/app-text/ptex/files/digest-ptex-3.1.4.20041109-r1
deleted file mode 100644
index 9a63320bdc22..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.4.20041109-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 d7a93c0405afadf8660f4c6f074e439e tetex-src-2.99.3.20041109-beta.tar.gz 12577686
-MD5 b70a6babed0dbe0fae83ce22602eb617 tetex-texmf-2.99.3.20041109-beta.tar.gz 84347101
-MD5 5668cecaa35eb13a4a1b81adc65faa97 ptetex3-20041118.tar.gz 2912158
-MD5 159f9f394af55d6d402431f71817ab09 tetex-2.99.3.20041109-gentoo.tar.gz 1831
diff --git a/app-text/ptex/files/digest-ptex-3.1.3-r1 b/app-text/ptex/files/digest-ptex-3.1.5
index 0d33a0536b2a..1d2ad21ea99d 100644
--- a/app-text/ptex/files/digest-ptex-3.1.3-r1
+++ b/app-text/ptex/files/digest-ptex-3.1.5
@@ -2,8 +2,8 @@ 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
 MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
-MD5 95aedfd68991f2ce0b1d94c8a662ef95 ptex-src-3.1.3.tar.gz 120649
-MD5 9171f289677684d97f28e95026e75426 ptex-texmf-2.2.tar.gz 1866278
+MD5 540af0eb4e6e5eb942e14bef0f8c1e8b ptex-src-3.1.5.tar.gz 122201
+MD5 e47a49328a369781d94c40355047ffc6 ptex-texmf-2.3.tar.gz 1866282
 MD5 cf7c5744c27d585384e414cf3e5ca4cd dvipsk-jpatch-p1.6a.tar.gz 29428
 MD5 291f5bd0cb68f2bcfdc289cdff24dd84 tetex-src-2.0.2-xdvik-y1.patch.gz 16294
 MD5 f1ab77fcd0bbc54415b88ce7d6ad557c tetex-src-2.0.2-xdvik-y1-j1.19.patch.gz 10936
diff --git a/app-text/ptex/files/digest-ptex-3.1.8.20050111 b/app-text/ptex/files/digest-ptex-3.1.8.20050111
new file mode 100644
index 000000000000..fb87fd16f5d3
--- /dev/null
+++ b/app-text/ptex/files/digest-ptex-3.1.8.20050111
@@ -0,0 +1,4 @@
+MD5 7e03edfba11b1d387448cd1b4e3c57cc tetex-src-2.99.9.20050111-beta.tar.gz 12580419
+MD5 4fdb60db585347ff2f3c7d9b3bca4e23 tetex-texmf-2.99.9.20050111-beta.tar.gz 90868185
+MD5 b09e06a55e96c268b8b93ca99b8c860c ptetex3-20050119.tar.gz 2928136
+MD5 addd74a87918b8193e5c8494138e41d7 tetex-2.99.9.20050111-gentoo.tar.gz 1663
diff --git a/app-text/ptex/ptex-3.1.4-r1.ebuild b/app-text/ptex/ptex-3.1.4-r1.ebuild
deleted file mode 100644
index 2ecf8a8777eb..000000000000
--- a/app-text/ptex/ptex-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.3 2005/01/01 16:32:00 eradicator Exp $
-
-PTEX_TEXMF_PV=2.2
-TETEX_PV=2.0.2
-
-inherit tetex eutils
-
-DESCRIPTION="The ASCII publishing TeX distribution"
-HOMEPAGE="http://www.ascii.co.jp/pb/ptex/"
-
-PTEX_SRC="ptex-src-${PV}.tar.gz"
-PTEX_TEXMF="ptex-texmf-${PTEX_TEXMF_PV}.tar.gz"
-
-SRC_PATH_PTEX="ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex"
-SRC_URI="${SRC_URI}
-	${SRC_PATH_PTEX}/tetex/${PTEX_SRC}
-	${SRC_PATH_PTEX}/tetex/${PTEX_TEXMF}
-	${SRC_PATH_PTEX}/dvips/dvipsk-jpatch-p1.6a.tar.gz
-	X? ( http://tutimura.ath.cx/~nob/tex/xdvi/tetex-src-2.0.2-xdvik-y1.patch.gz
-		http://tutimura.ath.cx/~nob/tex/xdvi/tetex-src-2.0.2-xdvik-y1-j1.19.patch.gz
-		http://www.nn.iij4u.or.jp/~tutimura/tex/xdvik-22.40y1-j1.21.patch.gz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~ppc ~sparc ~ppc64 ~ppc-macos"
-IUSE="X"
-
-DEPEND="X? ( >=media-libs/freetype-2
-	>=media-fonts/kochi-substitute-20030809-r3 )
-	!app-text/xdvik"
-
-src_unpack() {
-	tetex_src_unpack
-
-	einfo "Unpacking pTeX sources..."
-	cd ${S}/texmf
-	unpack ${PTEX_TEXMF}
-
-	cd ${S}/texk/web2c
-	unpack ${PTEX_SRC}
-
-	cd ${S}/texk
-	unpack dvipsk-jpatch-p1.6a.tar.gz
-	epatch dvipsk-5.92b-p1.6a.patch
-
-	if use X ; then
-		cd ${S}
-		epatch ${DISTDIR}/tetex-src-2.0.2-xdvik-y1.patch.gz
-		epatch ${DISTDIR}/xdvik-22.40y1-j1.21.patch.gz
-		epatch ${DISTDIR}/tetex-src-2.0.2-xdvik-y1-j1.19.patch.gz
-		sed -i -e "/\/usr\/local/s:^:%:g" \
-			-e "/kochi-.*-subst/s:%::g" \
-			-e "s:/usr/local:/usr:g" \
-			-e "s:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/kochi-substitute:g" \
-			${S}/texk/xdvik/vfontmap.freetype || die
-		cd texk/oxdvik
-		ln -s ../xdvik/*.{c,h} ./
-		cp -f ../xdvik/Makefile.in.oxdvi Makefile.in
-		cp -f ../xdvik/c-auto.in ./
-	fi
-}
-
-src_compile() {
-	if use X ; then
-		export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		TETEX_ECONF="--with-vflib=vf2ft"
-	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
-
-	cd ${S}/texk/web2c/${PN}-src-${PV} || die
-	./configure EUC || die "configure pTeX failed"
-
-	make programs || die "make pTeX failed"
-}
-
-src_install() {
-	tetex_src_install
-
-	einfo "Installing pTeX..."
-	cd ${S}/texk/web2c/${PN}-src-${PV} || die
-	einstall bindir=${D}/usr/bin texmf=${D}/usr/share/texmf || die
-
-	insinto /usr/share/texmf/dvips/config
-	newins ${FILESDIR}/psfonts-novflib-ja.map psfonts-ja.map
-	cat >>${D}/usr/share/texmf/web2c/updmap.cfg<<-EOF
-
-	# Japanese fonts
-	MixedMap psfonts-ja.map
-	EOF
-
-	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/ptex/ptex-3.1.4.20041109.ebuild b/app-text/ptex/ptex-3.1.4.20041109.ebuild
deleted file mode 100644
index d3f67e378199..000000000000
--- a/app-text/ptex/ptex-3.1.4.20041109.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2005 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.20041109.ebuild,v 1.2 2005/01/01 16:32:00 eradicator Exp $
-
-TETEX_PV=2.99.3.20041109
-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-20041118
-
-S=${WORKDIR}/tetex-src-${TETEX_PV}-beta
-
-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-${TETEX_PV}-beta.tar.gz"
-TETEX_TEXMF="tetex-texmf-${TETEX_PV}-beta.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
-	)
-	!dev-tex/memoir
-	!dev-tex/lineno
-	!dev-tex/SIunits
-	!dev-tex/floatflt
-	!dev-tex/g-brief
-	!dev-tex/pgf
-	!dev-tex/xcolor
-	!dev-tex/xkeyval"
-
-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-*.tar.gz || die
-	epatch dvipsk-*.diff
-
-	if use X ; then
-		cd ${S}
-		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-*-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/ptex/ptex-3.1.3-r1.ebuild b/app-text/ptex/ptex-3.1.5.ebuild
index b0222b0f2a96..bcb38f617cc9 100644
--- a/app-text/ptex/ptex-3.1.3-r1.ebuild
+++ b/app-text/ptex/ptex-3.1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.3-r1.ebuild,v 1.3 2005/01/01 16:32:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.5.ebuild,v 1.1 2005/01/21 11:40:29 usata Exp $
 
-PTEX_TEXMF_PV=2.2
+PTEX_TEXMF_PV=2.3
 TETEX_PV=2.0.2
 
 inherit tetex eutils
@@ -60,6 +60,14 @@ src_unpack() {
 		cp -f ../xdvik/Makefile.in.oxdvi Makefile.in
 		cp -f ../xdvik/c-auto.in ./
 	fi
+
+	# 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
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xdvizilla.patch
 }
 
 src_compile() {
diff --git a/app-text/ptex/ptex-3.1.4.20041109-r1.ebuild b/app-text/ptex/ptex-3.1.8.20050111.ebuild
index 9d29e40e576f..4246819c545d 100644
--- a/app-text/ptex/ptex-3.1.4.20041109-r1.ebuild
+++ b/app-text/ptex/ptex-3.1.8.20050111.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.20041109-r1.ebuild,v 1.2 2005/01/01 16:32:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.8.20050111.ebuild,v 1.1 2005/01/21 11:40:29 usata Exp $
 
-TETEX_PV=2.99.3.20041109
+TETEX_PV=2.99.9.20050111
 TEXMF_PATH=/var/lib/texmf
 
 inherit tetex eutils
@@ -12,10 +12,10 @@ 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_PV=2.3
+PTEX_SRC="ptex-src-${PV%.*}.tar.gz"
 PTEX_TEXMF="ptex-texmf-${PTEX_TEXMF_PV}.tar.gz"
-PTETEX=ptetex3-20041118
+PTETEX=ptetex3-20050119
 
 S=${WORKDIR}/tetex-src-${TETEX_PV}-beta