Version bumped.

(Portage version: 2.1.3.19)

10 files changed, 37 insertions, 704 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index b663da7464be..e4f3a72e3b08 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/ptex
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.74 2007/12/25 17:04:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.75 2007/12/31 14:18:51 matsuu Exp $
+
+*ptex-3.1.10_p20071214 (31 Dec 2007)
+
+  31 Dec 2007; MATSUU Takuto <matsuu@gentoo.org>
+  -files/ptex-3.1.10_p20071122-gentoo.patch, -ptex-3.1.5-r2.ebuild,
+  -ptex-3.1.8.1_p20050418.ebuild, -ptex-3.1.10_beta3.ebuild,
+  -ptex-3.1.10_p20071122.ebuild, +ptex-3.1.10_p20071214.ebuild:
+  Version bumped.
+  Removed old versions.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931.
diff --git a/app-text/ptex/files/digest-ptex-3.1.10_beta3 b/app-text/ptex/files/digest-ptex-3.1.10_beta3
deleted file mode 100644
index eb7836754394..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.10_beta3
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 71dfc6c1422ffb3fc2d538e2ab92fbdf ptetex-cmap-20051117.tar.gz 4061363
-RMD160 a9b4468979efc8b65161ce7deb7cd00d93dfff06 ptetex-cmap-20051117.tar.gz 4061363
-SHA256 34e50c63cba5aa1abfb1e4eece95aff9845c0f0c3115b65807670a2579a5a032 ptetex-cmap-20051117.tar.gz 4061363
-MD5 86fb1f968b66f0075fc10596257f070c ptetex3-20061108.tar.gz 5269378
-RMD160 ee9b4313054fd55178456383e65797a2fa1e2d65 ptetex3-20061108.tar.gz 5269378
-SHA256 1f0364c44601672400634e0a56ab12f6e9477232f86fbcb73e3ce30720fab4d0 ptetex3-20061108.tar.gz 5269378
-MD5 3d45189842f826b84ed867ab74a8b9fe tetex-3.0-gentoo.tar.gz 1352
-RMD160 ed72d127a34498a84854d02b9ebb4b74998b3e28 tetex-3.0-gentoo.tar.gz 1352
-SHA256 003d9fd0c90376263fe190bb85a8a0670e8cfa262ee5d01af4ac26aba02fdf25 tetex-3.0-gentoo.tar.gz 1352
-MD5 944a4641e79e61043fdaf8f38ecbb4b3 tetex-src-3.0.tar.gz 12749314
-RMD160 15a139f5f36993e4ed3583260e175cfb13ce7bcc tetex-src-3.0.tar.gz 12749314
-SHA256 9c0f7eaeb5ba6dc6f66433404d264941bf95cded2fa798b1f7a9dd580c21649b tetex-src-3.0.tar.gz 12749314
-MD5 ed9d30d9162d16ac8d5065cde6e0f6fa tetex-texmf-3.0.tar.gz 91402377
-RMD160 a1e87733fa3cbef04e39a690ed8549aeaaddb241 tetex-texmf-3.0.tar.gz 91402377
-SHA256 6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2 tetex-texmf-3.0.tar.gz 91402377
diff --git a/app-text/ptex/files/digest-ptex-3.1.10_p20071122 b/app-text/ptex/files/digest-ptex-3.1.10_p20071214
index 7c9f2908293b..7f0c8db219fc 100644
--- a/app-text/ptex/files/digest-ptex-3.1.10_p20071122
+++ b/app-text/ptex/files/digest-ptex-3.1.10_p20071214
@@ -1,9 +1,9 @@
 MD5 71dfc6c1422ffb3fc2d538e2ab92fbdf ptetex-cmap-20051117.tar.gz 4061363
 RMD160 a9b4468979efc8b65161ce7deb7cd00d93dfff06 ptetex-cmap-20051117.tar.gz 4061363
 SHA256 34e50c63cba5aa1abfb1e4eece95aff9845c0f0c3115b65807670a2579a5a032 ptetex-cmap-20051117.tar.gz 4061363
-MD5 5510d4a966bf6c9c44f6a85f0090c182 ptetex3-20071122.tar.gz 6171562
-RMD160 18a41c1eac40c747d9a7f988cdec428d3d5da96a ptetex3-20071122.tar.gz 6171562
-SHA256 25f0d35fbf074d75dd55a08910e6f7179500bb138547051bb3508b7879477fc1 ptetex3-20071122.tar.gz 6171562
+MD5 ad053895fc14e8e1012e8523dfab64ef ptetex3-20071214.tar.gz 6230299
+RMD160 248bb8df2718f67e2edff00ed79cc76a3f336e93 ptetex3-20071214.tar.gz 6230299
+SHA256 dd7be836e75009a0f029fbbabc0739d6e2bdd026b2480cc138560cd0b42fcc97 ptetex3-20071214.tar.gz 6230299
 MD5 f1c722c61acc20fea92d66c927eb5f99 ptex-3.1.10_p20071122-dviljk-security-fixes.patch.bz2 8739
 RMD160 7a63ebf1ebce0dbd7d48d9dbef2ea663ba187871 ptex-3.1.10_p20071122-dviljk-security-fixes.patch.bz2 8739
 SHA256 af6b92ee2640e754fc3e0b55e8aa7c8436d655f0d38e5afdd3badf5ee5f55c93 ptex-3.1.10_p20071122-dviljk-security-fixes.patch.bz2 8739
diff --git a/app-text/ptex/files/digest-ptex-3.1.5-r2 b/app-text/ptex/files/digest-ptex-3.1.5-r2
deleted file mode 100644
index 1349f537a7c7..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.5-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 71dfc6c1422ffb3fc2d538e2ab92fbdf ptetex-cmap-20051117.tar.gz 4061363
-RMD160 a9b4468979efc8b65161ce7deb7cd00d93dfff06 ptetex-cmap-20051117.tar.gz 4061363
-SHA256 34e50c63cba5aa1abfb1e4eece95aff9845c0f0c3115b65807670a2579a5a032 ptetex-cmap-20051117.tar.gz 4061363
-MD5 bc35493e1e07e819f203290ded77780a ptetex2-20050522.tar.gz 4031404
-RMD160 29a76f858b20cb6a344506c78b608cf08f2f49dc ptetex2-20050522.tar.gz 4031404
-SHA256 893d8b2bf244ddc3ddc08af6fa080c6dc312aac493720b2f19503c84e4c306f6 ptetex2-20050522.tar.gz 4031404
-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/ptex/files/digest-ptex-3.1.8.1_p20050418 b/app-text/ptex/files/digest-ptex-3.1.8.1_p20050418
deleted file mode 100644
index 02ffd74ebb63..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.8.1_p20050418
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 f28510040f03341a512a0660a740c85f ptetex3-20050418.tar.gz 3931706
-RMD160 50e65e2a4dfae351f4cb86e412c9525b6c0b4aef ptetex3-20050418.tar.gz 3931706
-SHA256 188f8f467e4cf2135a1908cc300d3714895682befc47bd1f92d2af1f04c44d85 ptetex3-20050418.tar.gz 3931706
-MD5 3d45189842f826b84ed867ab74a8b9fe tetex-3.0-gentoo.tar.gz 1352
-RMD160 ed72d127a34498a84854d02b9ebb4b74998b3e28 tetex-3.0-gentoo.tar.gz 1352
-SHA256 003d9fd0c90376263fe190bb85a8a0670e8cfa262ee5d01af4ac26aba02fdf25 tetex-3.0-gentoo.tar.gz 1352
-MD5 944a4641e79e61043fdaf8f38ecbb4b3 tetex-src-3.0.tar.gz 12749314
-RMD160 15a139f5f36993e4ed3583260e175cfb13ce7bcc tetex-src-3.0.tar.gz 12749314
-SHA256 9c0f7eaeb5ba6dc6f66433404d264941bf95cded2fa798b1f7a9dd580c21649b tetex-src-3.0.tar.gz 12749314
-MD5 ed9d30d9162d16ac8d5065cde6e0f6fa tetex-texmf-3.0.tar.gz 91402377
-RMD160 a1e87733fa3cbef04e39a690ed8549aeaaddb241 tetex-texmf-3.0.tar.gz 91402377
-SHA256 6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2 tetex-texmf-3.0.tar.gz 91402377
diff --git a/app-text/ptex/files/ptex-3.1.10_p20071122-gentoo.patch b/app-text/ptex/files/ptex-3.1.10_p20071122-gentoo.patch
deleted file mode 100644
index afc3122b2c92..000000000000
--- a/app-text/ptex/files/ptex-3.1.10_p20071122-gentoo.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -r -u ptetex3-20071122-orig/2extract-src.sh ptetex3-20071122/2extract-src.sh
---- ptetex3-20071122-orig/2extract-src.sh	2007-11-19 15:46:22.000000000 +0900
-+++ ptetex3-20071122/2extract-src.sh	2007-11-28 14:02:13.072620383 +0900
-@@ -147,29 +147,29 @@
-     $CP $SRC/texk/dvipsk/* $SRC/texk/pdvipsk/
-     $MKDIR $SRC/texk/pxdvik
-     $CP -r $SRC/texk/xdvik/* $SRC/texk/pxdvik/
--    P=p
-+    DVIPSK_P=p
- fi # "$JAPANESE" = "international"
- ## for dvipsk
- #tarx archive/dvipsk-jpatch-p1.7a.tar.gz          $SRC/texk/${P}dvipsk
--#cpatch $SRC/texk/${P}dvipsk/dvipsk-p1.7a.patch 1 $SRC/texk/${P}dvipsk
--$CP $SRC/texk/${P}dvipsk/Makefile.in $SRC/texk/${P}dvipsk/Makefile.in.tetex
--tarx archive/dvipsk-5.95b-p1.7a.tar.gz                $SRC/texk/${P}dvipsk
--cpatch $SRC/texk/${P}dvipsk/dvipsk-5.95b-p1.7a.diff 1 $SRC/texk/${P}dvipsk
-+#cpatch $SRC/texk/${DVIPSK_P}dvipsk/dvipsk-p1.7a.patch 1 $SRC/texk/${DVIPSK_P}dvipsk
-+$CP $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in.tetex
-+tarx archive/dvipsk-5.95b-p1.7a.tar.gz                $SRC/texk/${DVIPSK_P}dvipsk
-+cpatch $SRC/texk/${DVIPSK_P}dvipsk/dvipsk-5.95b-p1.7a.diff 1 $SRC/texk/${DVIPSK_P}dvipsk
- ## disable installing 'config.ps'
--$CP $SRC/texk/${P}dvipsk/Makefile.in       $SRC/texk/${P}dvipsk/Makefile.in.jp
--$CP $SRC/texk/${P}dvipsk/Makefile.in.tetex $SRC/texk/${P}dvipsk/Makefile.in
-+$CP $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in       $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in.jp
-+$CP $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in.tetex $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in
- ## disable psfonts_jp.map
--#perlprint 's/^(p \+psfonts\_jp\.map)/* \1/g' $SRC/texk/${P}dvipsk/config.ps
-+#perlprint 's/^(p \+psfonts\_jp\.map)/* \1/g' $SRC/texk/${DVIPSK_P}dvipsk/config.ps
- #perlnoprint '$a=1 if /^# psfonts_jp.map/; $a=0 if /^# Info files/;
--#	print unless $a' $SRC/texk/${P}dvipsk/Makefile.in
-+#	print unless $a' $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in
- 
- ## for xdvik
--zpatch archive/xdvik-200?????-tetex-3.0.diff.gz 3 $SRC/texk/${P}xdvik
-+zpatch archive/xdvik-200?????-tetex-3.0.diff.gz 3 $SRC/texk/${DVIPSK_P}xdvik
- # fix for FC5
- perlprint 'print "#define NeedWidePrototypes 1\n" if /limits/' \
--    $SRC/texk/${P}xdvik/xdvi.h
-+    $SRC/texk/${DVIPSK_P}xdvik/xdvi.h
- # adjust X resource
--cat <<EOF >> $SRC/texk/${P}xdvik/texmf/XDvi || exit 1
-+cat <<EOF >> $SRC/texk/${DVIPSK_P}xdvik/texmf/XDvi || exit 1
- 
- 
- !!! ------- added by ptetex3 -------
-diff -r -u ptetex3-20071122-orig/7font-search.sh ptetex3-20071122/7font-search.sh
---- ptetex3-20071122-orig/7font-search.sh	2007-11-28 14:04:06.338929949 +0900
-+++ ptetex3-20071122/7font-search.sh	2007-11-28 14:08:20.836792289 +0900
-@@ -51,6 +51,17 @@
-     done
- }
- 
-+mksymlink_gentoo(){
-+    $MKDIR $TRUETYPE
-+    fonts_dir=/usr/share/fonts/
-+    find $fonts_dir -maxdepth 1 -mindepth 1 -type d | while read font_path; do
-+	if [ `find $font_path -maxdepth 1 -type f -iname '*.ttf' | wc -l` -gt 0 ]; then
-+	    font_name=${font_path/$fonts_dir/}
-+	    test -h ${TRUETYPE}/${font_name} && continue
-+	    $LN "${font_path}" "${TRUETYPE}/${font_name}"
-+	fi
-+    done
-+}
- 
- setrmlgbm() {
-     if test -n "$2"; then
-@@ -105,7 +116,8 @@
- ### リンク名  検索ディレクトリ/ファイル
- Acrobat4    /usr{,/local,/sfw}{,/lib}/Acrobat4/Resource/CMap
- Acrobat5    /usr{,/local,/sfw}{,/lib}/Acrobat5/Resource/Font
--Acrobat7    /usr{,/local,/sfw}{,/lib}{,/Adobe}/Acrobat7.0/Resource/CMap
-+Acrobat7    /opt/Acrobat7/Resource/CMap
-+Acrobat8    /opt/Adobe/Reader8/Resource/CMap
- ghostscript /usr{,/local,/sfw}/{share,lib}/ghostscript{,/*}/Resource/CMap
- openwinja   /usr/openwin/lib/locale/ja/X11/Resource/CMap
- openwinko   /usr/openwin/lib/locale/ko/X11/Resource/CMap
-@@ -113,18 +125,7 @@
- openwintw   /usr/openwin/lib/locale/zh_TW.BIG5/X11/Resource/CMap
- EOF
- 
--mksymlink $TRUETYPE <<EOF
--### リンク名  検索ディレクトリ/ファイル
--x11       /usr{,/local,/X11R6}/lib/X11/fonts/truetype
--X11       /usr{,/local,/X11R6}/lib/X11/fonts/TrueType
--X11TTF    /usr{,/local,/X11R6}/lib/X11/fonts/TTF
--openwin   /usr/openwin/lib/locale/ja/X11/fonts/TT
--truetype  /usr/share/fonts/truetype
--TTF	  /usr/share/fonts/TTF
--ja        /usr/share/fonts/ja/TrueType
--japanese  /usr/share/fonts/japanese/TrueType
--QtPalmtop /opt/QtPalmtop/lib/X11/fonts/TrueType
--EOF
-+mksymlink_gentoo
- 
- mksymlink $OPENTYPE <<EOF
- ### リンク名  検索ディレクトリ/ファイル
-@@ -181,6 +182,10 @@
- #  the former, more general
- #  the latter, higher quality
- rmlgbm <<EOF
-+# IPA font https://sourceforge.jp/projects/opfc/
-+# (opfc-ModuleHP-1.1.1_withIPAFonts.tar.gz)
-+	ipam.ttf
-+	ipag.ttf
- # kochi (distribution stopped)
- 	kochi-mincho.ttf
- 	kochi-gothic.ttf
-@@ -190,10 +195,6 @@
- # sazanami http://wiki.fdiary.net/font/?sazanami
- 	sazanami-mincho.ttf
- 	sazanami-gothic.ttf
--# IPA font https://sourceforge.jp/projects/opfc/
--# (opfc-ModuleHP-1.1.1_withIPAFonts.tar.gz)
--	ipam.ttf
--	ipag.ttf
- # DynaLab
- 	dfmimp3.ttc
- 	dfgotp5.ttc
diff --git a/app-text/ptex/ptex-3.1.10_beta3.ebuild b/app-text/ptex/ptex-3.1.10_beta3.ebuild
deleted file mode 100644
index aa85285db69a..000000000000
--- a/app-text/ptex/ptex-3.1.10_beta3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_beta3.ebuild,v 1.2 2007/01/28 06:00:36 genone Exp $
-
-TETEX_PV=3.0
-
-inherit tetex-3 flag-o-matic
-
-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.4
-PTEX_SRC="ptex-src-${PV/_b/-B}.tar.gz"
-PTEX_TEXMF="ptex-texmf-${PTEX_TEXMF_PV}.tar.gz"
-PTETEX="ptetex3-20061108"
-PTETEX_CMAP="ptetex-cmap-20051117"
-
-S=${WORKDIR}/tetex-src-${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/current/distrib"
-TETEX_SRC="tetex-src-${TETEX_PV}.tar.gz"
-TETEX_TEXMF="tetex-texmf-${TETEX_PV}.tar.gz"
-TETEX_TEXMF_SRC=""
-SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
-	${SRC_PATH_TETEX}/${TETEX_TEXMF}
-	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex3/${PTETEX}.tar.gz
-	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex-cmap/${PTETEX_CMAP}.tar.gz
-	mirror://gentoo/tetex-${TETEX_PV}-gentoo.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~ppc-macos ~sh ~sparc ~x86"
-IUSE="X motif lesstif Xaw3d neXt"
-
-DEPEND=">=app-text/tetex-3
-	!<app-text/ptetex-3.1.9
-	X? ( >=media-libs/freetype-2.1.10
-		media-fonts/kochi-substitute
-	)"
-# it doesn't provide tetex anymore
-PROVIDE=""
-
-src_unpack() {
-	unpack ${PTETEX}.tar.gz
-	unpack ${PTETEX_CMAP}.tar.gz
-	tetex-3_src_unpack
-
-	einfo "Unpacking pTeX sources ..."
-	cd ${S}/texmf
-	echo ">>> Unpacking ${PTEX_TEXMF} to ${S}/texmf ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/${PTEX_TEXMF} || die
-
-	echo ">>> Unpacking jis and morisawa fonts ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/jis.tar.gz -C ${WORKDIR} || die
-	tar xzf ${WORKDIR}/${PTETEX}/archive/morisawa.tar.gz -C ${WORKDIR} || 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.95b-p1.7a.tar.gz || die
-	epatch dvipsk-5.95b-p1.7a.diff
-
-	if use X ; then
-		cd ${S}
-		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-tetex-3.0-22.84.10.diff.gz
-		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-tetex-3.0-20061107.diff.gz
-		epatch ${FILESDIR}/xdvi-xorg-7.0.patch
-	fi
-}
-
-src_compile() {
-
-	if use X ; then
-		export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		TETEX_ECONF="${TETEX_ECONF} --with-vflib=vf2ft --enable-freetype"
-		TETEX_ECONF="${TETEX_ECONF} --program-prefix=p"
-	fi
-
-	tetex-3_src_compile
-
-	# make ptex.tex visible to ptex
-	TEXMF="${S}/texmf" ${S}/texk/kpathsea/mktexlsr || die
-
-	cd ${S}/texk/web2c/ptex-src-* || die
-	chmod +x configure
-	./configure EUC || die "configure pTeX failed"
-
-	TEXMF="${S}/texmf" make || die "make pTeX failed"
-}
-
-src_install() {
-	addwrite /var/cache/fonts
-	addwrite /var/lib/texmf
-	addwrite /usr/share/texmf
-
-	#tetex-3_src_install
-
-	einfo "Installing pTeX texmf ..."
-	cd ${S}/texmf
-	insinto /usr/share/texmf
-	doins -r ptex
-	doins -r jbibtex
-
-	einfo "Installing pdvips and pxdvik ..."
-	cd ${S}/texk/xdvik
-	dobin pxdvi*.bin      || die
-	newbin xdvi-sh pxdvi  || die
-	dosym /usr/bin/pxdvi /usr/bin/opxdvi || die
-	insinto /var/lib/texmf/xdvi
-	newins ${FILESDIR}/ptex-xdvi-vfontmap-kochi-substitute vfontmap || die
-	cd ${S}/texk/dvipsk
-	newbin dvips pdvips   || die
-	dosym /usr/bin/pdvips /usr/bin/opdvips || die
-	insinto /var/lib/fonts/map/dvips/ptex
-	doins psfonts_jp.map
-
-	rm -f ${D}/usr/bin/afm2tfm || die
-
-	#dosym /usr/bin/tex /usr/bin/virtex
-	#dosym /usr/bin/pdftex /usr/bin/pdfvirtex
-
-	einfo "Installing pTeX ..."
-	cd ${S}/texk/web2c/ptex-src-* || die
-	# fix texmf.cnf failure
-	sed -i -e "s:\$(web2cdir)/texmf.cnf:${D}${TEXMF_PATH}/texmf.cnf:g" \
-		Makefile || die
-	TEXMF="${S}/texmf" einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH} || die
-
-	# conflict with ones from tetex
-	rm -f ${D}/usr/bin/tftopl || die
-	rm -f ${D}/usr/bin/pltotf || die
-
-	# fonts
-	cd ${S}/texmf/fonts
-	einfo "Installing source fonts ..."
-	insinto /usr/share/texmf/fonts/source
-	doins -r ${S}/texmf/fonts/source/ascgrp || die "installing source/ascgrp failed"
-	doins -r ${S}/texmf/fonts/source/ptex   || die "installing source/ptex failed"
-
-	einfo "Installing CMap fonts ..."
-	cd ${D}/usr/share/texmf/fonts
-	unzip ${WORKDIR}/${PTETEX_CMAP}/adobe-cmaps-200406.zip || die
-	cd -
-
-	einfo "Installing vf and tfm fonts ..."
-	insinto /usr/share/texmf/fonts/tfm
-	doins -r ${S}/texmf/fonts/tfm/ascgrp || die "installing tfm/ascgrp failed"
-	doins -r ${S}/texmf/fonts/tfm/ptex   || die "installing tfm/ptex failed"
-	doins -r ${WORKDIR}/jis/tfm/*        || die "installing jis/tfm failed"
-	doins -r ${WORKDIR}/morisawa/tfm/*   || die "installing morisawa/tfm failed"
-	insinto /usr/share/texmf/fonts/vf
-	doins -r ${S}/texmf/fonts/vf/ptex || die "installing ptex/vf failed"
-	doins -r ${WORKDIR}/jis/vf/*      || die "installing jis/vf failed"
-	doins -r ${WORKDIR}/morisawa/vf/* || die "installing morisawa/vf failed"
-
-	# populating /etc/texmf
-	insinto /usr/share/texmf/fonts/map/dvips/tetex
-	doins ${FILESDIR}/psfonts-ja.map || die
-	insinto /etc/texmf/updmap.d
-	doins ${FILESDIR}/20updmap-ja.cfg
-	insinto /etc/texmf/fmtutil.d
-	doins ${FILESDIR}/20fmtutil-platex.cnf
-	insinto /etc/texmf/texmf.d
-	doins ${FILESDIR}/10texmf-ptex.cnf
-	doins ${FILESDIR}/20texmf-cmap.cnf
-	for cfg in ptex/plain/config/ptex.ini \
-			   ptex/platex/config/platex.ini \
-			   ptex/platex/config/hyphen.cfg; do
-		insinto /etc/texmf/${cfg%/*}
-		doins ${D}/usr/share/texmf/${cfg}
-		rm -f ${D}/usr/share/texmf/${cfg}
-		dosym /etc/texmf/${cfg%/*} /usr/share/texmf/${cfg}
-	done
-
-	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
-}
-
-pkg_postinst() {
-	# earlier declaration of TEXINPUTS hides our ptex configuration
-	sed -i -e '/TEXINPUTS.platex/d' ${ROOT}/etc/texmf/texmf.d/00texmf.cnf
-	tetex-3_pkg_postinst
-
-	elog
-	elog "Japanese dvips and xdvi have been renamed to pdvips and pxdvi."
-	elog "You also need to emerge app-text/dvipdfmx to convert dvi into PDF."
-	elog
-}
diff --git a/app-text/ptex/ptex-3.1.10_p20071122.ebuild b/app-text/ptex/ptex-3.1.10_p20071214.ebuild
index 0ecd908fddec..e30cb8a7ada0 100644
--- a/app-text/ptex/ptex-3.1.10_p20071122.ebuild
+++ b/app-text/ptex/ptex-3.1.10_p20071214.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20071122.ebuild,v 1.2 2007/12/01 02:52:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20071214.ebuild,v 1.1 2007/12/31 14:18:51 matsuu Exp $
 
 TETEX_PV=3.0_p1
 
@@ -25,10 +25,10 @@ SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
 	${SRC_PATH_TETEX}/${TETEX_TEXMF_SRC}
 	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex3/${PTETEX}.tar.gz
 	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex-cmap/${PTETEX_CMAP}.tar.gz
-	mirror://gentoo/${P}-dviljk-security-fixes.patch.bz2"
+	mirror://gentoo/${PN}-3.1.10_p20071122-dviljk-security-fixes.patch.bz2"
 #	mirror://gentoo/tetex-${TETEX_PV}-gentoo.tar.gz
 
-KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 BUILD_DIR="${WORKDIR}/build/usr"
 
@@ -45,21 +45,18 @@ DEPEND="!app-text/tetex
 		>=media-libs/freetype-2.3.4
 		|| (
 			media-fonts/ja-ipafonts
+			media-fonts/ipamonafont
+			media-fonts/vlgothic
 			media-fonts/sazanami
 			media-fonts/kochi-substitute
 		)
 	)"
 
-RESTRICT="test"
-
 S="${WORKDIR}/${PTETEX}"
 
 # Sorry this provides tetex again...
 PROVIDE="virtual/tetex"
 
-# Parallel make b0rks
-MAKEOPTS="-j1"
-
 src_unpack() {
 	#tetex-3_src_unpack
 	mkdir -p "${WORKDIR}/${TETEX_TEXMF}"
@@ -68,7 +65,7 @@ src_unpack() {
 	cd "${WORKDIR}"
 	unpack ${TETEX_SRC}
 	cd "${WORKDIR}"
-	unpack ${P}-dviljk-security-fixes.patch.bz2
+	unpack ${PN}-3.1.10_p20071122-dviljk-security-fixes.patch.bz2
 	unpack ${PTETEX}.tar.gz
 	unpack ${PTETEX_CMAP}.tar.gz
 	echo ">>> Unpacking jis and morisawa fonts ..."
@@ -77,7 +74,7 @@ src_unpack() {
 
 	# Gentoo box reserves variable ${P}!!
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.1.10_p20071203-gentoo.patch
 
 	cat <<EOF > "${S}"/my_option
 SRC_DIR="${WORKDIR}"
@@ -142,14 +139,14 @@ EOF
 
 	cd "${S}"
 	unset TEXMFMAIN TEXMF HOME
-	emake x || die "emake x failed"
+	emake -j1 x || die "emake x failed"
 
 	cd "${TETEX_S}"
 
 	epatch "${FILESDIR}/tetex-${SMALL_PV}-kpathsea-pic.patch"
 
 	# bug 85404
-	epatch "${FILESDIR}/${P}-epstopdf-wrong-rotation.patch"
+	epatch "${FILESDIR}/${PN}-3.1.10_p20071122-epstopdf-wrong-rotation.patch"
 
 	# ptetex included
 	#epatch "${FILESDIR}/tetex-${TETEX_PV}-amd64-xdvik-wp.patch"
@@ -157,14 +154,14 @@ EOF
 
 	#bug 98029
 	# no need
-	#epatch "${FILESDIR}/${P}-fmtutil-etex.patch"
+	#epatch "${FILESDIR}/${PN}-3.1.10_p20071122-fmtutil-etex.patch"
 
 	#bug 115775
 	# ptex included
 	#epatch "${FILESDIR}/tetex-${TETEX_PV}-xpdf-vulnerabilities.patch"
 
 	# bug 94860
-	epatch "${FILESDIR}/${P}-pdftosrc-install.patch"
+	epatch "${FILESDIR}/${PN}-3.1.10_p20071122-pdftosrc-install.patch"
 
 	# bug 126918
 	epatch "${FILESDIR}/tetex-${TETEX_PV}-create-empty-files.patch"
@@ -184,8 +181,7 @@ EOF
 	epatch "${FILESDIR}/tetex-${TETEX_PV}-dvips_bufferoverflow.patch"
 
 	# securty bug #196735
-	# ptetex included
-	#epatch "${FILESDIR}/xpdf-3.02pl2.patch"
+	epatch "${FILESDIR}/xpdf-3.02pl2.patch"
 
 	# Construct a Gentoo site texmf directory
 	# that overlays the upstream supplied
@@ -193,7 +189,7 @@ EOF
 	#epatch "${FILESDIR}/tetex-${TETEX_PV}-texmf-site.patch"
 
 	# security bug #198238
-	epatch "${WORKDIR}/${P}-dviljk-security-fixes.patch"
+	epatch "${WORKDIR}/${PN}-3.1.10_p20071122-dviljk-security-fixes.patch"
 
 	# security bug #198238 and bug #193437
 	epatch "${FILESDIR}/tetex-${TETEX_PV}-t1lib-SA26241_buffer_overflow.patch"
@@ -205,17 +201,21 @@ EOF
 src_compile() {
 	unset TEXMFMAIN TEXMF HOME
 
-	emake c || die "emake c failed"
-	emake macro || die "emake macro failed"
-	emake otf || die "emake otf failed"
-	emake fonty || die "emake fonty failed"
-	emake babel || die "emake babel failed"
+	emake -j1 c || die "emake c failed"
+	emake -j1 macro || die "emake macro failed"
+	emake -j1 otf || die "emake otf failed"
+	emake -j1 fonty || die "emake fonty failed"
+	emake -j1 babel || die "emake babel failed"
 
 	einfo "Setting ptetex-cmap ..."
 	cd "${WORKDIR}/${PTETEX_CMAP}"
 	PATH="${BUILD_DIR}/bin:$PATH" ./setup.sh "${BUILD_DIR}"/share/texmf/fonts/cmap
 }
 
+src_test() {
+	emake -j1 test || die "emake test failed"
+}
+
 src_install() {
 	#tetex-3_src_install
 	einfo "Installing ptetex3 binaries ..."
@@ -268,10 +268,8 @@ src_install() {
 	#TEXMF="${D}"/usr/share/texmf "${D}"/usr/bin/mktexlsr || die
 }
 
-pkg_config() {
-	if [ "$ROOT" = "/" ] ; then
-		/usr/sbin/texmf-update
-	fi
+pkg_postinst() {
+	tetex-3_pkg_postinst
 
 	elog
 	elog "Japanese dvips and xdvi have been renamed to pdvipsk and pxdvik."
diff --git a/app-text/ptex/ptex-3.1.5-r2.ebuild b/app-text/ptex/ptex-3.1.5-r2.ebuild
deleted file mode 100644
index ff6a2600cebb..000000000000
--- a/app-text/ptex/ptex-3.1.5-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.5-r2.ebuild,v 1.3 2006/11/14 17:36:42 usata Exp $
-
-PTEX_TEXMF_PV=2.3
-TETEX_PV=2.0.2
-
-inherit tetex-2
-
-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"
-PTETEX="ptetex2-20050522"
-PTETEX_CMAP="ptetex-cmap-20051117"
-
-SRC_URI="${SRC_URI}
-	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex2/${PTETEX}.tar.gz
-	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex-cmap/${PTETEX_CMAP}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="X"
-
-DEPEND="X? ( >=media-libs/freetype-2
-	>=media-fonts/kochi-substitute-20030809-r3 )
-	!app-text/xdvik
-	!app-text/tetex"
-
-src_unpack() {
-	unpack ${PTETEX}.tar.gz
-	unpack ${PTETEX_CMAP}.tar.gz
-	tetex-2_src_unpack
-
-	einfo "Unpacking pTeX sources..."
-	cd ${S}/texmf
-	echo ">>> Unpacking ${PTEX_TEXMF} to ${S}/texmf ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/${PTEX_TEXMF} || die
-
-	echo ">>> Unpacking jis fonts to ${S}/texmf/fonts ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/jis.tar.gz -C ${T} || die
-	mv ${T}/jis/tfm/ptex/* ${S}/texmf/fonts/tfm/ptex || die
-	mv ${T}/jis/vf*        ${S}/texmf/fonts/vf/ptex  || die
-
-	echo ">>> Unpacking morisawa fonts to ${S}/texmf/fonts ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/morisawa.tar.gz -C ${T} || die
-	mv ${T}/morisawa/tfm/dvips/* ${S}/texmf/fonts/tfm/ptex || die
-	mv ${T}/morisawa/tfm/ptex/*  ${S}/texmf/fonts/tfm/ptex || die
-	mv ${T}/morisawa/vf/*        ${S}/texmf/fonts/vf/ptex  || die
-
-	cd ${S}/texmf/fonts
-	echo ">>> Unpacking CMap fonts to ${S}/texmf/fonts ..."
-	unzip ${WORKDIR}/${PTETEX_CMAP}/adobe-cmaps-200406.zip || 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-jpatch-p1.6a1.tar.gz || die
-	epatch dvipsk-5.92b-p1.6a1.patch
-
-	if use X ; then
-		cd ${S}
-		epatch ${WORKDIR}/${PTETEX}/archive/tetex-src-2.0.2-xdvik-y1.patch.gz
-		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-22.40y1-j1.21.patch.gz
-		epatch ${WORKDIR}/${PTETEX}/archive/tetex-src-2.0.2-xdvik-y1-j1.19.patch.gz
-		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-22.40y1-waitpid.patch
-		epatch ${FILESDIR}/xdvi-xorg-7.0.patch
-		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
-
-	# 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
-
-	#bug 115775
-	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p2" epatch ${FILESDIR}/xpdf-2.02pl1-CAN-2005-3191-3.patch
-
-	#bug 122365
-	EPATCH_OPTS="-d ${WORKDIR}" epatch ${FILESDIR}/${P}-flex-unput.patch
-
-	# bug 118264
-	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
-
-}
-
-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/kpathsea/texmf.cnf<<-EOF
-
-	CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/opt/Acrobat7/Resource/Font//;/usr/share/xpdf//;/usr/share/ghostscript/Resource//;/usr/share/texmf/fonts/CMap//
-	EOF
-
-	cd ${S}/texk/web2c/${PN}-src-${PV} || die
-	./configure EUC || die "configure pTeX failed"
-
-	make programs || die "make pTeX failed"
-}
-
-src_install() {
-	tetex-2_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
-	doins ${FILESDIR}/psfonts-ja.map || die
-	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.8.1_p20050418.ebuild b/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild
deleted file mode 100644
index 5c8886229d4e..000000000000
--- a/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild,v 1.5 2006/11/14 17:36:42 usata Exp $
-
-TETEX_PV=3.0
-
-inherit tetex-3 flag-o-matic
-
-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.3
-PTEX_SRC="ptex-src-${PV%_*}.tar.gz"
-PTEX_TEXMF="ptex-texmf-${PTEX_TEXMF_PV}.tar.gz"
-PTETEX=ptetex3-${PV//*_p}
-
-S=${WORKDIR}/tetex-src-${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/current/distrib"
-TETEX_SRC="tetex-src-${TETEX_PV}.tar.gz"
-TETEX_TEXMF="tetex-texmf-${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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
-IUSE="X"
-
-DEPEND="X? ( >=media-libs/freetype-2
-		>=media-fonts/kochi-substitute-20030809-r3
-	)
-	!app-text/tetex"
-
-src_unpack() {
-	unpack ${PTETEX}.tar.gz
-	tetex-3_src_unpack
-
-	einfo "Unpacking pTeX sources ..."
-	cd ${S}/texmf
-	echo ">>> Unpacking ${PTEX_TEXMF} to ${S}/texmf ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/${PTEX_TEXMF} || die
-
-	echo ">>> Unpacking jis fonts to ${S}/texmf/fonts ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/jis.tar.gz -C ${T} || die
-	mv ${T}/jis/tfm/ptex/* ${S}/texmf/fonts/tfm/ptex || die
-	mv ${T}/jis/vf/*       ${S}/texmf/fonts/vf/ptex  || die
-
-	echo ">>> Unpacking morisawa fonts to ${S}/texmf/fonts ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/morisawa.tar.gz -C ${T} || die
-	mv ${T}/morisawa/tfm/dvips/* ${S}/texmf/fonts/tfm/ptex || die
-	mv ${T}/morisawa/tfm/ptex/*  ${S}/texmf/fonts/tfm/ptex || die
-	mv ${T}/morisawa/vf/*        ${S}/texmf/fonts/vf/ptex  || 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-*.patch
-
-	if use X ; then
-		cd ${S}
-		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-*.diff.gz
-		epatch ${FILESDIR}/xdvi-xorg-7.0.patch
-		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"
-		TETEX_ECONF="${TETEX_ECONF} --with-vflib=vf2ft --enable-freetype"
-	fi
-
-	tetex-3_src_compile
-
-	# 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"
-
-	TEXMF="${S}/texmf" make || die "make pTeX failed"
-}
-
-src_install() {
-	addwrite /var/cache/fonts
-	addwrite /var/lib/texmf
-	addwrite /usr/share/texmf
-
-	tetex-3_src_install
-
-	dosym /usr/bin/tex /usr/bin/virtex
-	dosym /usr/bin/pdftex /usr/bin/pdfvirtex
-
-	einfo "Installing pTeX ..."
-	cd ${S}/texk/web2c/${PTEX_SRC%.tar.gz} || die
-	# fix texmf.cnf failure
-	sed -i -e "s:\$(web2cdir)/texmf.cnf:${D}${TEXMF_PATH}/texmf.cnf:g" \
-		Makefile || die
-	TEXMF="${S}/texmf" einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH} || die
-
-	insinto /usr/share/texmf/fonts/map/dvips/tetex
-	doins ${FILESDIR}/psfonts-ja.map || die
-	insinto /etc/texmf/updmap.d
-	doins ${FILESDIR}/20updmap-ja.cfg
-	insinto /etc/texmf/fmtutil.d
-	doins ${FILESDIR}/20fmtutil-platex.cnf
-	insinto /etc/texmf/texmf.d
-	sed -i -e '/TEXINPUTS.platex/d' ${D}/etc/texmf/texmf.d/00texmf.cnf
-	doins ${FILESDIR}/10texmf-ptex.cnf
-	doins ${FILESDIR}/20texmf-cmap.cnf
-
-	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
-}