Version bumped and fixed bug #89429.

Package-Manager: portage-2.0.51.19

7 files changed, 50 insertions, 187 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 1fcaea49acc8..4e24639305a0 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,13 @@
 # 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.45 2005/04/08 14:31:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.46 2005/04/19 07:51:40 usata Exp $
+
+*ptex-3.1.8.1_p20050418 (19 Apr 2005)
+
+  19 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +files/10texmf-ptex.cnf,
+  -ptex-3.1.8.1_p20050325.ebuild, -ptex-3.1.8.1_p20050405.ebuild,
+  +ptex-3.1.8.1_p20050418.ebuild:
+  Version bumped and fixed bug #89429.
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> ptex-3.1.5.ebuild:
   Stable on ppc64
diff --git a/app-text/ptex/Manifest b/app-text/ptex/Manifest
index f57dce88d8f9..dc72d2a67340 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -1,22 +1,21 @@
-MD5 0ffccec39d18a5a4920293d76e9713d1 ChangeLog 6620
-MD5 d2fd604b88f163116f23670ca84b1815 metadata.xml 531
+MD5 f4dacad25285fd71b633da7dbbe28991 ptex-3.1.8.1.ebuild 4986
 MD5 6159b18f18d59387df77cb2813192347 ptex-3.1.4-r2.ebuild 3526
+MD5 73d3968a207c6b1cad78af272d0ae39c ChangeLog 6871
+MD5 d2fd604b88f163116f23670ca84b1815 metadata.xml 531
 MD5 3f169da4e4346adecedf12050b56a97e ptex-3.1.5.ebuild 3535
-MD5 f4dacad25285fd71b633da7dbbe28991 ptex-3.1.8.1.ebuild 4986
-MD5 209618f44503fb7602ea5aaddf8429f7 ptex-3.1.8.1_p20050325.ebuild 4928
-MD5 c68b3743f00f26ebe50b1293f6506fb9 ptex-3.1.8.1_p20050405.ebuild 4738
+MD5 dd71ce3866d7de096837448e9b2fbdda ptex-3.1.8.1_p20050418.ebuild 4952
+MD5 02883507686a831b844da77bd0fb2b3a files/10texmf-ptex.cnf 722
+MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
+MD5 661aaa7be66ace377a17bb300e99b508 files/digest-ptex-3.1.8.1 271
 MD5 4d1956517ccb98e9be75cdf83f9b7ac0 files/20fmtutil-platex.cnf 121
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
+MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
 MD5 a1829990d625a3607cc38b99a27b9574 files/20texmf-cmap.cnf 65
 MD5 d4d469b2a8b88c4d97440979fd5c2a41 files/20updmap-ja.cfg 43
 MD5 424cf5900fe6b1af9867cd2e8c952292 files/digest-ptex-3.1.4-r2 718
 MD5 3e6bd16aa42a2c0f77d9ea14dabb96f3 files/digest-ptex-3.1.5 718
-MD5 661aaa7be66ace377a17bb300e99b508 files/digest-ptex-3.1.8.1 271
-MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
-MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
-MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
 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
 MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
-MD5 87133c725fc92254cef1555a5643da86 files/digest-ptex-3.1.8.1_p20050325 271
-MD5 0b67e958c7f04df95667731e071a3efa files/digest-ptex-3.1.8.1_p20050405 271
+MD5 8649a146af71c946a9a5acd6495d1ec6 files/digest-ptex-3.1.8.1_p20050418 271
diff --git a/app-text/ptex/files/10texmf-ptex.cnf b/app-text/ptex/files/10texmf-ptex.cnf
new file mode 100644
index 000000000000..7c80a7534e33
--- /dev/null
+++ b/app-text/ptex/files/10texmf-ptex.cnf
@@ -0,0 +1,20 @@
+% -- ptex configuration params added by texmf-update --
+
+% pTeX.
+ptex_inputs = .;$TEXMF/{ptex,tex}/{plain,generic,}//
+platex209_inputs = .;$TEXMF/{ptex,tex}/{platex209,plain,platex,}//
+platex2e_inputs = .;$TEXMF/{ptex,tex}/{platex,latex,generic,}//
+TEXINPUTS.platex209 = $platex209_inputs
+TEXINPUTS.platex-sjis = $platex2e_inputs
+TEXINPUTS.platex-euc = $platex2e_inputs
+TEXINPUTS.platex-jis = $platex2e_inputs
+TEXINPUTS.platex = $platex2e_inputs
+TEXINPUTS.ptex-sjis = $ptex_inputs
+TEXINPUTS.ptex-euc = $ptex_inputs
+TEXINPUTS.ptex-jis = $ptex_inputs
+TEXINPUTS.ptex = $ptex_inputs
+
+BIBINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bib//
+BSTINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bst//
+
+% -- ptex configuration ends here --
diff --git a/app-text/ptex/files/digest-ptex-3.1.8.1_p20050405 b/app-text/ptex/files/digest-ptex-3.1.8.1_p20050405
deleted file mode 100644
index 96585471ec83..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.8.1_p20050405
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 944a4641e79e61043fdaf8f38ecbb4b3 tetex-src-3.0.tar.gz 12749314
-MD5 11aa15c8d3e28ee7815e0d5fcdf43fd4 tetex-texmf-3.0.tar.gz 91762123
-MD5 0036aa5c49db75b3ec089e9d00bc1fd9 ptetex3-20050405.tar.gz 3844338
-MD5 3d45189842f826b84ed867ab74a8b9fe tetex-3.0-gentoo.tar.gz 1352
diff --git a/app-text/ptex/files/digest-ptex-3.1.8.1_p20050325 b/app-text/ptex/files/digest-ptex-3.1.8.1_p20050418
index 55e6cfd622c3..bf2fa99273ab 100644
--- a/app-text/ptex/files/digest-ptex-3.1.8.1_p20050325
+++ b/app-text/ptex/files/digest-ptex-3.1.8.1_p20050418
@@ -1,4 +1,4 @@
 MD5 944a4641e79e61043fdaf8f38ecbb4b3 tetex-src-3.0.tar.gz 12749314
 MD5 11aa15c8d3e28ee7815e0d5fcdf43fd4 tetex-texmf-3.0.tar.gz 91762123
-MD5 5e8ecc2d03086fe8b2ee80ca00c79dc3 ptetex3-20050325.tar.gz 3843842
+MD5 f28510040f03341a512a0660a740c85f ptetex3-20050418.tar.gz 3931706
 MD5 3d45189842f826b84ed867ab74a8b9fe tetex-3.0-gentoo.tar.gz 1352
diff --git a/app-text/ptex/ptex-3.1.8.1_p20050325.ebuild b/app-text/ptex/ptex-3.1.8.1_p20050325.ebuild
deleted file mode 100644
index d54bb7476332..000000000000
--- a/app-text/ptex/ptex-3.1.8.1_p20050325.ebuild
+++ /dev/null
@@ -1,164 +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.8.1_p20050325.ebuild,v 1.3 2005/04/05 17:10:57 usata Exp $
-
-TETEX_PV=3.0
-TEXMF_PATH=/var/lib/texmf
-
-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 ~hppa ~ia64 ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="X motif lesstif Xaw3d neXt"
-
-DEPEND="X? ( >=media-libs/freetype-2
-		>=media-fonts/kochi-substitute-20030809-r3
-		motif? ( lesstif? ( x11-libs/lesstif )
-			!lesstif? ( x11-libs/openmotif ) )
-		!motif? ( neXt? ( x11-libs/neXtaw )
-			!neXt? ( 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-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
-
-	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
-		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() {
-	sed -i -e "/mktexlsr/,+3d" -e "s/\(updmap-sys\)/\1 --nohash/" Makefile.in || die
-
-	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 neXt ; then
-			toolkit="neXtaw"
-		elif use Xaw3d ; then
-			toolkit="xaw3d"
-		else
-			toolkit="xaw"
-		fi
-
-		TETEX_ECONF="--with-vflib=vf2ft --enable-freetype --with-xdvi-x-toolkit=${toolkit}"
-	fi
-
-	tetex_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"
-
-	make || die "make pTeX failed"
-}
-
-src_install() {
-	addwrite /var/cache/fonts
-	addwrite /var/lib/texmf
-	addwrite /usr/share/texmf
-	tetex-3_src_install base doc fixup
-
-	einfo "Installing pTeX ..."
-	dodir ${TEXMF_PATH}/web2c
-	cd ${S}/texk/web2c/${PTEX_SRC%.tar.gz} || die
-	einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH} || die
-
-	# ptex reinstalls ${TEXMF_PATH}/web2c
-	tetex_src_install link
-
-	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}/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
-}
diff --git a/app-text/ptex/ptex-3.1.8.1_p20050405.ebuild b/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild
index 26f7f4746689..83a73348a1f0 100644
--- a/app-text/ptex/ptex-3.1.8.1_p20050405.ebuild
+++ b/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild
@@ -1,6 +1,6 @@
 # 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.8.1_p20050405.ebuild,v 1.1 2005/04/07 16:15:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.8.1_p20050418.ebuild,v 1.1 2005/04/19 07:51:40 usata Exp $
 
 TETEX_PV=3.0
 
@@ -105,22 +105,25 @@ src_compile() {
 	chmod +x configure
 	./configure EUC || die "configure pTeX failed"
 
-	make || die "make 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 base doc fixup
+
+	tetex-3_src_install
 
 	dosym /usr/bin/tex /usr/bin/virtex
 	dosym /usr/bin/pdftex /usr/bin/pdfvirtex
 
 	einfo "Installing pTeX ..."
-	dodir ${TEXMF_PATH}/web2c
 	cd ${S}/texk/web2c/${PTEX_SRC%.tar.gz} || die
-	einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH} || 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
@@ -129,6 +132,8 @@ src_install() {
 	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