Use included xdvik.

10 files changed, 280 insertions, 71 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 32ff3d7676fc..bf55a1358f01 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.20 2004/10/24 03:41:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.21 2004/10/26 15:13:50 usata Exp $
+
+*ptex-3.1.4-r1 (27 Oct 2004)
+
+  27 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> files/psfonts-ja.map,
+  -files/psfonts-novflib-ja.map, +ptex-3.1.3-r1.ebuild, ptex-3.1.3.ebuild,
+  +ptex-3.1.4-r1.ebuild, ptex-3.1.4.ebuild:
+  Use included xdvik.
 
   24 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> ptex-3.1.3.ebuild,
   ptex-3.1.4.ebuild:
diff --git a/app-text/ptex/Manifest b/app-text/ptex/Manifest
index 0d5ef04e9b77..14118e75cbea 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 62b79f7858d932f5e173e86d8b4dee98 ChangeLog 2792
+MD5 958870299e29cb8c160e24d4e4f961f9 ptex-3.1.4-r1.ebuild 3034
+MD5 95ba87dcbb0a27aabd2fbcf1be40d9f7 ptex-3.1.3.ebuild 1882
+MD5 dc09294bcb2d9f68a9c7197e4259c4c2 ptex-3.1.3-r1.ebuild 3034
+MD5 31fcc8f0ac4aaea758ac2df3f9b56624 ptex-3.1.4.ebuild 1899
+MD5 12331735cb3c179117b77b9756486772 ChangeLog 3035
 MD5 d2fd604b88f163116f23670ca84b1815 metadata.xml 531
-MD5 532134824726a3f3cc59a1cde782ec9c ptex-3.1.3.ebuild 1906
-MD5 f59e3af4948b26eccdc31374aea95b45 ptex-3.1.4.ebuild 1923
-MD5 cb7b6b0b14b8e8b5b1ae59795883d687 files/digest-ptex-3.1.3 416
-MD5 8d6f7372f16899ab048c61a738b48065 files/psfonts-ja.map 1184
-MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-novflib-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 cb7b6b0b14b8e8b5b1ae59795883d687 files/digest-ptex-3.1.3 416
 MD5 2d234949b4bccea51b2dd3370d251937 files/digest-ptex-3.1.4 417
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (Darwin)
-
-iD8DBQFBeySzVWNWqTUmv+0RAhScAJ97iTxToJzWZ85K9yH1e41QmQDQRACgmvTr
-acKVV2HYqYGGygu+6srL01o=
-=+gEn
------END PGP SIGNATURE-----
+MD5 8113ccc1c2391267a4ec7e4cab747449 files/digest-ptex-3.1.3-r1 650
+MD5 a4a2e15d1825811ccf63105d36a232e8 files/digest-ptex-3.1.4-r1 650
+MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
+MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0.2-dont-run-config.diff 1243
diff --git a/app-text/ptex/files/digest-ptex-3.1.3-r1 b/app-text/ptex/files/digest-ptex-3.1.3-r1
new file mode 100644
index 000000000000..ef132f4bf03c
--- /dev/null
+++ b/app-text/ptex/files/digest-ptex-3.1.3-r1
@@ -0,0 +1,9 @@
+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 95aedfd68991f2ce0b1d94c8a662ef95 ptex-src-3.1.3.tar.gz 120649
+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-r1 b/app-text/ptex/files/digest-ptex-3.1.4-r1
new file mode 100644
index 000000000000..812b99bee2cc
--- /dev/null
+++ b/app-text/ptex/files/digest-ptex-3.1.4-r1
@@ -0,0 +1,9 @@
+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 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/psfonts-ja.map b/app-text/ptex/files/psfonts-ja.map
index cc6c3232a48d..60ecf40a65bb 100644
--- a/app-text/ptex/files/psfonts-ja.map
+++ b/app-text/ptex/files/psfonts-ja.map
@@ -4,10 +4,10 @@
 rmlsl       ".167 SlantFont"  Ryumin-Light-H 
 gbmsl       ".167 SlantFont"  GothicBBB-Medium-H
 %%
-rml         Ryumin-Light-H	<`min
-rmlv        Ryumin-Light-V	<`min
-gbm         GothicBBB-Medium-H	<`goth
-gbmv        GothicBBB-Medium-V	<`goth
+rml         Ryumin-Light-H
+rmlv        Ryumin-Light-V
+gbm         GothicBBB-Medium-H
+gbmv        GothicBBB-Medium-V
 %%
 %rml         Ryumin-Light-Ext-H
 %rmlv        Ryumin-Light-Ext-V
diff --git a/app-text/ptex/files/psfonts-novflib-ja.map b/app-text/ptex/files/psfonts-novflib-ja.map
deleted file mode 100644
index 60ecf40a65bb..000000000000
--- a/app-text/ptex/files/psfonts-novflib-ja.map
+++ /dev/null
@@ -1,45 +0,0 @@
-%
-% Japanese (JIS encoding)
-%
-rmlsl       ".167 SlantFont"  Ryumin-Light-H 
-gbmsl       ".167 SlantFont"  GothicBBB-Medium-H
-%%
-rml         Ryumin-Light-H
-rmlv        Ryumin-Light-V
-gbm         GothicBBB-Medium-H
-gbmv        GothicBBB-Medium-V
-%%
-%rml         Ryumin-Light-Ext-H
-%rmlv        Ryumin-Light-Ext-V
-%gbm         GothicBBB-Medium-Ext-H
-%gbmv        GothicBBB-Medium-Ext-V
-%
-% Morisawa
-%
-ryumin-l    Ryumin-Light-H
-ryumin-l-v  Ryumin-Light-V
-gtbbb-m     GothicBBB-Medium-H
-gtbbb-m-v   GothicBBB-Medium-V
-futomin-b   FutoMinA101-Bold-H
-futomin-b-v FutoMinA101-Bold-V
-futogo-b    FutoGoB101-Bold-H
-futogo-b-v  FutoGoB101-Bold-V
-jun101-l    Jun101-Light-H
-jun101-l-v  Jun101-Light-V
-%
-% ums package + virtual fonts
-%
-unimin      Ryumin-Light-UniJIS-UCS2-H
-unigoth     GothicBBB-Medium-UniJIS-UCS2-H
-%
-% utf package (S. Saito)
-%
-unijmin-h   Ryumin-Light-UniJIS-UTF16-H
-unijmin-v   Ryumin-Light-UniJIS-UTF16-V
-unijgoth-h  GothicBBB-Medium-UniJIS-UTF16-H
-unijgoth-v  GothicBBB-Medium-UniJIS-UTF16-V
-%%
-cidmin-h    Ryumin-Light-Identity-H
-cidmin-v    Ryumin-Light-Identity-V
-cidgoth-h   GothicBBB-Medium-Identity-H
-cidgoth-v   GothicBBB-Medium-Identity-V
diff --git a/app-text/ptex/ptex-3.1.3-r1.ebuild b/app-text/ptex/ptex-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..c1c795a4d298
--- /dev/null
+++ b/app-text/ptex/ptex-3.1.3-r1.ebuild
@@ -0,0 +1,118 @@
+# 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.3-r1.ebuild,v 1.1 2004/10/26 15:13:50 usata 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.3.ebuild b/app-text/ptex/ptex-3.1.3.ebuild
index d31224f5f9f5..a8a2653f51b1 100644
--- a/app-text/ptex/ptex-3.1.3.ebuild
+++ b/app-text/ptex/ptex-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.14 2004/10/24 03:41:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.3.ebuild,v 1.15 2004/10/26 15:13:50 usata Exp $
 
 PTEX_TEXMF_PV=2.1
 TETEX_PV=2.0.2
@@ -71,7 +71,7 @@ src_install() {
 	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
+	doins ${FILESDIR}/psfonts-ja.map
 	cat >>${D}/usr/share/texmf/web2c/updmap.cfg<<-EOF
 
 	# Japanese fonts
diff --git a/app-text/ptex/ptex-3.1.4-r1.ebuild b/app-text/ptex/ptex-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..5f4501ef850e
--- /dev/null
+++ b/app-text/ptex/ptex-3.1.4-r1.ebuild
@@ -0,0 +1,118 @@
+# 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-r1.ebuild,v 1.1 2004/10/26 15:13:50 usata 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.ebuild b/app-text/ptex/ptex-3.1.4.ebuild
index 751be7c74abb..c1c4ab3aa109 100644
--- a/app-text/ptex/ptex-3.1.4.ebuild
+++ b/app-text/ptex/ptex-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2004/10/24 03:41:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.4.ebuild,v 1.3 2004/10/26 15:13:50 usata Exp $
 
 PTEX_TEXMF_PV=2.2
 TETEX_PV=2.0.2
@@ -71,7 +71,7 @@ src_install() {
 	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
+	doins ${FILESDIR}/psfonts-ja.map
 	cat >>${D}/usr/share/texmf/web2c/updmap.cfg<<-EOF
 
 	# Japanese fonts