Updated not to block app-text/tetex. Added explicit blocks to old versions. Added several directories to CMap search path. Removed old ebuild.

Package-Manager: portage-2.1.2_rc1-r6

9 files changed, 491 insertions, 8 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 0f02079efdc7..e20fd9f33b1f 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/ptex
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.60 2006/10/23 12:03:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.61 2006/11/14 17:36:42 usata Exp $
+
+*ptex-3.1.10_beta3 (14 Nov 2006)
+
+  14 Nov 2006; Mamoru KOMACHI <usata@gentoo.org> files/20texmf-cmap.cnf,
+  +files/ptex-xdvi-vfontmap-ja-ipafonts,
+  +files/ptex-xdvi-vfontmap-kochi-substitute, ptex-3.1.5-r1.ebuild,
+  ptex-3.1.5-r2.ebuild, -ptex-3.1.8.1.ebuild, ptex-3.1.8.1_p20050418.ebuild,
+  +ptex-3.1.10_beta3.ebuild:
+  Updated not to block app-text/tetex. Added explicit blocks to app-text/tetex
+  to old versions. Added several dirs to CMap search path. Removed old ebuild.
 
   23 Oct 2006; Mamoru KOMACHI <usata@gentoo.org> +files/xdvi-xorg-7.0.patch,
   ptex-3.1.5-r2.ebuild, ptex-3.1.8.1_p20050418.ebuild:
diff --git a/app-text/ptex/files/20texmf-cmap.cnf b/app-text/ptex/files/20texmf-cmap.cnf
index 274694067e91..72a6b465abeb 100644
--- a/app-text/ptex/files/20texmf-cmap.cnf
+++ b/app-text/ptex/files/20texmf-cmap.cnf
@@ -1,3 +1,3 @@
 
-CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/usr/share/xpdf//
+CMAPINPUTS = .;/usr/share/ghostscript//;/opt/Acrobat5/Resource//;/opt/Acrobat7/Resource//;/usr/share/xpdf//
 
diff --git a/app-text/ptex/files/digest-ptex-3.1.10_beta3 b/app-text/ptex/files/digest-ptex-3.1.10_beta3
new file mode 100644
index 000000000000..16d6768a5062
--- /dev/null
+++ b/app-text/ptex/files/digest-ptex-3.1.10_beta3
@@ -0,0 +1,15 @@
+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 11aa15c8d3e28ee7815e0d5fcdf43fd4 tetex-texmf-3.0.tar.gz 91762123
+RMD160 67cb6325f1edbea89c4723791116717190ec73c4 tetex-texmf-3.0.tar.gz 91762123
+SHA256 88fd25d86888f264306e109961be791e2c0686c88035beed6a984dced5093ebe tetex-texmf-3.0.tar.gz 91762123
diff --git a/app-text/ptex/files/ptex-xdvi-vfontmap-ja-ipafonts b/app-text/ptex/files/ptex-xdvi-vfontmap-ja-ipafonts
new file mode 100644
index 000000000000..7f0c5d10ca1e
--- /dev/null
+++ b/app-text/ptex/files/ptex-xdvi-vfontmap-ja-ipafonts
@@ -0,0 +1,126 @@
+%
+% Sample "vfontmap"
+%
+
+% [single style]
+% "tfm" "enc" "font"
+
+% [multi style]
+% "/font/file/name"
+%    "tfm1" "enc"
+%    "tfm2" "enc"
+
+% "enc" is one of following.
+% "JIS-H" "Unicode-H" "Identity-H"
+% "JIS-V" "Unicode-V" "Identity-V"
+
+
+%/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+%/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
+%/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf
+/usr/share/fonts/ja-ipafonts/ipam.ttf
+	rml  JIS-H
+	rmlv JIS-V
+%/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+%/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
+%/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf
+/usr/share/fonts/ja-ipafonts/ipag.ttf
+	gbm  JIS-H
+	gbmv JIS-V
+
+min     JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
+nmin    JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
+goth    JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+tmin    JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
+tgoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+ngoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+jis     JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
+jisg    JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+dm      JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
+dg      JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+mgoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+fmin    JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
+fgoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+maru	JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
+
+% UTF package
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+	unijmin-h  Unicode-H    % \UTF font
+	unijmin-v  Unicode-V    % \UTF font
+	cidmin-h   Identity-H   % \CID font
+	cidmin-v   Identity-V   % \CID font
+	hmr        JIS-H
+	hmrv       JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+	unijgoth-h  Unicode-H   % \UTF font
+	unijgoth-v  Unicode-V   % \UTF font
+	cidgoth-h   Identity-H  % \CID font
+	cidgoth-v   Identity-V  % \CID font
+	hkb         JIS-H
+	hkbv        JIS-V
+
+% OTF package
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+	otf-ujmr-h  Unicode-H
+	otf-ujmr-v  Unicode-V
+	otf-cjmr-h  Identity-H
+	otf-cjmr-v  Identity-V
+	hminr-h     JIS-H
+	hminr-v     JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
+	otf-ujgr-h  Unicode-H
+	otf-ujgr-v  Unicode-V
+	otf-cjgr-h  Identity-H
+	otf-cjgr-v  Identity-V
+	hgothr-h    JIS-H
+	hgothr-v    JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
+	otf-ujmb-h  Unicode-H
+	otf-ujmb-v  Unicode-V
+	otf-cjmb-h  Identity-H
+	otf-cjmb-v  Identity-V
+	hminb-h     JIS-H
+	hminb-v     JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+	otf-ujgb-h  Unicode-H
+	otf-ujgb-v  Unicode-V
+	otf-cjgb-h  Identity-H
+	otf-cjgb-v  Identity-V
+	hgothb-h    JIS-H
+	hgothb-v    JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
+	otf-ujmgr-h  Unicode-H
+	otf-ujmgr-v  Unicode-V
+	otf-cjmgr-h  Identity-H
+	otf-cjmgr-v  Identity-V
+	hmgothr-h    JIS-H
+	hmgothr-v    JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf
+	otf-utmr-h  Unicode-H
+	otf-utmr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/MHei-Medium.otf
+	otf-utgr-h  Unicode-H
+	otf-utgr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf
+	otf-ucmr-h  Unicode-H
+	otf-ucmr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/STHeiti-Regular.otf
+	otf-ucgr-h  Unicode-H
+	otf-ucgr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf
+	otf-ukmr-h  Unicode-H
+	otf-ukmr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HYGoThic-Medium-UniKS.otf
+	otf-ukgr-h  Unicode-H
+	otf-ukgr-v  Unicode-V
diff --git a/app-text/ptex/files/ptex-xdvi-vfontmap-kochi-substitute b/app-text/ptex/files/ptex-xdvi-vfontmap-kochi-substitute
new file mode 100644
index 000000000000..5a998c5cef92
--- /dev/null
+++ b/app-text/ptex/files/ptex-xdvi-vfontmap-kochi-substitute
@@ -0,0 +1,126 @@
+%
+% Sample "vfontmap"
+%
+
+% [single style]
+% "tfm" "enc" "font"
+
+% [multi style]
+% "/font/file/name"
+%    "tfm1" "enc"
+%    "tfm2" "enc"
+
+% "enc" is one of following.
+% "JIS-H" "Unicode-H" "Identity-H"
+% "JIS-V" "Unicode-V" "Identity-V"
+
+
+%/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+%/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
+%/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf
+/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+	rml  JIS-H
+	rmlv JIS-V
+%/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+%/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
+%/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf
+/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+	gbm  JIS-H
+	gbmv JIS-V
+
+min     JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+nmin    JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+goth    JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+tmin    JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+tgoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+ngoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+jis     JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+jisg    JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+dm      JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+dg      JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+mgoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+fmin    JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
+fgoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+maru	JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
+
+% UTF package
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+	unijmin-h  Unicode-H    % \UTF font
+	unijmin-v  Unicode-V    % \UTF font
+	cidmin-h   Identity-H   % \CID font
+	cidmin-v   Identity-V   % \CID font
+	hmr        JIS-H
+	hmrv       JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+	unijgoth-h  Unicode-H   % \UTF font
+	unijgoth-v  Unicode-V   % \UTF font
+	cidgoth-h   Identity-H  % \CID font
+	cidgoth-v   Identity-V  % \CID font
+	hkb         JIS-H
+	hkbv        JIS-V
+
+% OTF package
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+	otf-ujmr-h  Unicode-H
+	otf-ujmr-v  Unicode-V
+	otf-cjmr-h  Identity-H
+	otf-cjmr-v  Identity-V
+	hminr-h     JIS-H
+	hminr-v     JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
+	otf-ujgr-h  Unicode-H
+	otf-ujgr-v  Unicode-V
+	otf-cjgr-h  Identity-H
+	otf-cjgr-v  Identity-V
+	hgothr-h    JIS-H
+	hgothr-v    JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
+	otf-ujmb-h  Unicode-H
+	otf-ujmb-v  Unicode-V
+	otf-cjmb-h  Identity-H
+	otf-cjmb-v  Identity-V
+	hminb-h     JIS-H
+	hminb-v     JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+	otf-ujgb-h  Unicode-H
+	otf-ujgb-v  Unicode-V
+	otf-cjgb-h  Identity-H
+	otf-cjgb-v  Identity-V
+	hgothb-h    JIS-H
+	hgothb-v    JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
+	otf-ujmgr-h  Unicode-H
+	otf-ujmgr-v  Unicode-V
+	otf-cjmgr-h  Identity-H
+	otf-cjmgr-v  Identity-V
+	hmgothr-h    JIS-H
+	hmgothr-v    JIS-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf
+	otf-utmr-h  Unicode-H
+	otf-utmr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/MHei-Medium.otf
+	otf-utgr-h  Unicode-H
+	otf-utgr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf
+	otf-ucmr-h  Unicode-H
+	otf-ucmr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/STHeiti-Regular.otf
+	otf-ucgr-h  Unicode-H
+	otf-ucgr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf
+	otf-ukmr-h  Unicode-H
+	otf-ukmr-v  Unicode-V
+
+/usr/local/share/texmf/dvipdfm/CIDFont/HYGoThic-Medium-UniKS.otf
+	otf-ukgr-h  Unicode-H
+	otf-ukgr-v  Unicode-V
diff --git a/app-text/ptex/ptex-3.1.10_beta3.ebuild b/app-text/ptex/ptex-3.1.10_beta3.ebuild
new file mode 100644
index 000000000000..ed0ea1a09e48
--- /dev/null
+++ b/app-text/ptex/ptex-3.1.10_beta3.ebuild
@@ -0,0 +1,203 @@
+# 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.10_beta3.ebuild,v 1.1 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.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
+
+	einfo
+	einfo "Japanese dvips and xdvi have been renamed to pdvips and pxdvi."
+	einfo "You also need to emerge app-text/dvipdfmx to convert dvi into PDF."
+	einfo
+}
diff --git a/app-text/ptex/ptex-3.1.5-r1.ebuild b/app-text/ptex/ptex-3.1.5-r1.ebuild
index bb64cca2720a..095e01d37020 100644
--- a/app-text/ptex/ptex-3.1.5-r1.ebuild
+++ b/app-text/ptex/ptex-3.1.5-r1.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/ptex/ptex-3.1.5-r1.ebuild,v 1.10 2006/03/10 02:13:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.5-r1.ebuild,v 1.11 2006/11/14 17:36:42 usata Exp $
 
 PTEX_TEXMF_PV=2.3
 TETEX_PV=2.0.2
@@ -29,7 +29,8 @@ IUSE="X"
 
 DEPEND="X? ( >=media-libs/freetype-2
 	>=media-fonts/kochi-substitute-20030809-r3 )
-	!app-text/xdvik"
+	!app-text/xdvik
+	!app-tex/tetex"
 
 src_unpack() {
 	tetex-2_src_unpack
diff --git a/app-text/ptex/ptex-3.1.5-r2.ebuild b/app-text/ptex/ptex-3.1.5-r2.ebuild
index 385aebbe5fb2..ff6a2600cebb 100644
--- a/app-text/ptex/ptex-3.1.5-r2.ebuild
+++ b/app-text/ptex/ptex-3.1.5-r2.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/ptex/ptex-3.1.5-r2.ebuild,v 1.2 2006/10/23 12:03:36 usata Exp $
+# $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
@@ -26,7 +26,8 @@ IUSE="X"
 
 DEPEND="X? ( >=media-libs/freetype-2
 	>=media-fonts/kochi-substitute-20030809-r3 )
-	!app-text/xdvik"
+	!app-text/xdvik
+	!app-text/tetex"
 
 src_unpack() {
 	unpack ${PTETEX}.tar.gz
diff --git a/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild b/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild
index da61bd101194..5c8886229d4e 100644
--- a/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild
+++ b/app-text/ptex/ptex-3.1.8.1_p20050418.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/ptex/ptex-3.1.8.1_p20050418.ebuild,v 1.4 2006/11/12 05:13:03 vapier Exp $
+# $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
 
@@ -35,7 +35,8 @@ IUSE="X"
 
 DEPEND="X? ( >=media-libs/freetype-2
 		>=media-fonts/kochi-substitute-20030809-r3
-	)"
+	)
+	!app-text/tetex"
 
 src_unpack() {
 	unpack ${PTETEX}.tar.gz