Changed updmap.cfg, fmtutil.cnf and mktex.cnf to use /etc/texmf/{updmap.d,fmtutil.d,mktex.d}. This will close bug #21501 and bug #56440.

8 files changed, 73 insertions, 49 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 98aa2f04bbbc..c0b9568e7c69 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,16 @@
 # 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.24 2004/11/18 17:24:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.25 2004/11/20 17:47:31 usata Exp $
+
+*ptex-3.1.4.20041109-r1 (21 Nov 2004)
+
+  21 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/20fmtutil-platex.cnf, +files/20texmf-cmap.cnf,
+  +files/20updmap-ja.cfg, -ptex-3.1.4.20041026.ebuild,
+  +ptex-3.1.4.20041109-r1.ebuild:
+  Changed updmap.cfg, fmtutil.cnf and mktex.cnf to use
+  /etc/texmf/{updmap.d,fmtutil.d,mktex.d}.
+  This will close bug #21501 and bug #56440.
 
 *ptex-3.1.4.20041109 (19 Nov 2004)
 
diff --git a/app-text/ptex/Manifest b/app-text/ptex/Manifest
index 77b3fbfb522a..e1de434e27e9 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -1,23 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7f93615d30041e839d644bff221a4d82 ChangeLog 3576
+MD5 11cb0e31f2f36e4fee1d63758ba54f89 ChangeLog 3953
 MD5 d2fd604b88f163116f23670ca84b1815 metadata.xml 531
+MD5 7d242cad63d1ff69597229982966d6b7 ptex-3.1.4.20041109-r1.ebuild 4754
 MD5 95ba87dcbb0a27aabd2fbcf1be40d9f7 ptex-3.1.3.ebuild 1882
 MD5 b5d3e3ffe96c2355d2c83d1f187b9912 ptex-3.1.3-r1.ebuild 3034
 MD5 ae10e61a7921d04c17b9cee8bcc9e0ef ptex-3.1.4-r1.ebuild 3034
-MD5 2e6625704b55fce6c67733b47c19cdc4 ptex-3.1.4.20041026.ebuild 4752
 MD5 3b29486ba00d8acfc598ff780788b2d1 ptex-3.1.4.20041109.ebuild 4849
-MD5 75b6015c4ec058f264eb767326626843 files/digest-ptex-3.1.3 484
+MD5 a1829990d625a3607cc38b99a27b9574 files/20texmf-cmap.cnf 65
+MD5 3cbdb92af75d2424acadf9037f0f8977 files/digest-ptex-3.1.3-r1 718
 MD5 d15f2d9ab04bcfa15c3e737f106d1625 files/psfonts-ja.map 1158
 MD5 04ffb231db607a3a8ce7168600fee9b1 files/digest-ptex-3.1.4.20041109 317
-MD5 e92d37a7194d0412dddad7a7f543e3b0 files/digest-ptex-3.1.4.20041026 317
-MD5 3cbdb92af75d2424acadf9037f0f8977 files/digest-ptex-3.1.3-r1 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-r1 718
+MD5 d4d469b2a8b88c4d97440979fd5c2a41 files/20updmap-ja.cfg 43
+MD5 04ffb231db607a3a8ce7168600fee9b1 files/digest-ptex-3.1.4.20041109-r1 317
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (Darwin)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBnNrHVWNWqTUmv+0RAkwfAJwNtzdvSxGPpxhxMb2lpIDvI+0jfgCglgDt
-rqAUMiimNmT3gNfc16A0Zd8=
-=XfsK
+iD8DBQFBn4GjVWNWqTUmv+0RAne1AJ9ZYGC6FD27KqnhUpqXkZqBaPSV1gCeKJMZ
+isFbxue0cDsC5I9N9tSyapY=
+=NSpE
 -----END PGP SIGNATURE-----
diff --git a/app-text/ptex/files/20fmtutil-platex.cnf b/app-text/ptex/files/20fmtutil-platex.cnf
new file mode 100644
index 000000000000..567c6e227bfc
--- /dev/null
+++ b/app-text/ptex/files/20fmtutil-platex.cnf
@@ -0,0 +1,6 @@
+
+# Japanese pLaTeX:
+ptex		ptex	-		ptex.ini
+platex		ptex	language.dat	platex.ini
+platex209	ptex	language.dat	plplain.ini
+
diff --git a/app-text/ptex/files/20texmf-cmap.cnf b/app-text/ptex/files/20texmf-cmap.cnf
new file mode 100644
index 000000000000..274694067e91
--- /dev/null
+++ b/app-text/ptex/files/20texmf-cmap.cnf
@@ -0,0 +1,3 @@
+
+CMAPINPUTS = .;/opt/Acrobat5/Resource/Font//;/usr/share/xpdf//
+
diff --git a/app-text/ptex/files/20updmap-ja.cfg b/app-text/ptex/files/20updmap-ja.cfg
new file mode 100644
index 000000000000..918a3768f3a5
--- /dev/null
+++ b/app-text/ptex/files/20updmap-ja.cfg
@@ -0,0 +1,4 @@
+
+# Japanese fonts
+MixedMap psfonts-ja.map
+
diff --git a/app-text/ptex/files/digest-ptex-3.1.4.20041026 b/app-text/ptex/files/digest-ptex-3.1.4.20041026
deleted file mode 100644
index 902d479ed8ea..000000000000
--- a/app-text/ptex/files/digest-ptex-3.1.4.20041026
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5f3d46a777ccb746c60e0d4b588c62bf tetex-src-beta-2.99.1.20041026.tar.gz 12565292
-MD5 099935025a9585b95b38a0ef1ac8278b tetex-texmf-beta-2.99.1.20041026.tar.gz 84068568
-MD5 39b4038606f813f5f575d6817be95c97 ptetex3-20041027.tar.gz 2904987
-MD5 97b0444abc22e96521ea94a33b8f5165 tetex-2.99.1.20041026-gentoo.tar.gz 2252
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
new file mode 100644
index 000000000000..9a63320bdc22
--- /dev/null
+++ b/app-text/ptex/files/digest-ptex-3.1.4.20041109-r1
@@ -0,0 +1,4 @@
+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/ptex-3.1.4.20041026.ebuild b/app-text/ptex/ptex-3.1.4.20041109-r1.ebuild
index 38eb22f34c22..7d486d4993b6 100644
--- a/app-text/ptex/ptex-3.1.4.20041026.ebuild
+++ b/app-text/ptex/ptex-3.1.4.20041109-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.20041026.ebuild,v 1.1 2004/11/05 16:53:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.4.20041109-r1.ebuild,v 1.1 2004/11/20 17:47:31 usata Exp $
 
-TETEX_PV=2.99.1.20041026
+TETEX_PV=2.99.3.20041109
 TEXMF_PATH=/var/lib/texmf
 
 inherit tetex eutils
@@ -15,14 +15,14 @@ HOMEPAGE="http://www.ascii.co.jp/pb/ptex/
 PTEX_TEXMF_PV=2.2
 PTEX_SRC="ptex-src-${PV%.*}b.tar.gz"
 PTEX_TEXMF="ptex-texmf-${PTEX_TEXMF_PV}.tar.gz"
-PTETEX=ptetex3-20041027
+PTETEX=ptetex3-20041118
 
-S=${WORKDIR}/tetex-src-beta-${TETEX_PV}
+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-beta-${TETEX_PV}.tar.gz"
-TETEX_TEXMF="tetex-texmf-beta-${TETEX_PV}.tar.gz"
+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}
@@ -32,15 +32,24 @@ SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~amd64 ~ppc ~sparc ~ppc64 ~ppc-macos"
-IUSE="X motif lesstif Xaw3d"
+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? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!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
@@ -57,12 +66,12 @@ src_unpack() {
 
 	cd ${S}/texk
 	echo ">>> Unpacking dvipsk-jpatch to ${S}/texk ..."
-	tar xzf ${WORKDIR}/${PTETEX}/archive/dvipsk-5.94b-p1.6a.tar.gz || die
-	epatch dvipsk-5.94b-p1.6a.diff
+	tar xzf ${WORKDIR}/${PTETEX}/archive/dvipsk-*.tar.gz || die
+	epatch dvipsk-*.diff
 
 	if use X ; then
 		cd ${S}
-		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-22.84.4-tetex-20040628-jp.diff.gz
+		epatch ${WORKDIR}/${PTETEX}/archive/xdvik-*-jp.diff.gz
 		cat >>${S}/texk/xdvik/vfontmap.sample<<-EOF
 
 		# TrueType fonts
@@ -93,6 +102,8 @@ src_compile() {
 				export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
 			fi
 			toolkit="motif"
+		elif use neXt ; then
+			toolkit="neXtaw"
 		elif use Xaw3d ; then
 			toolkit="xaw3d"
 		else
@@ -104,19 +115,6 @@ src_compile() {
 
 	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
 
@@ -131,22 +129,22 @@ src_install() {
 	tetex_src_install base doc fixup
 
 	einfo "Installing pTeX ..."
-	dodir ${D}${TEXMF_PATH}/web2c
+	dodir ${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
 
+	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