Version bumped.

Removed lesstif USE flag, bug #209859.
Clean up ebuild.
(Portage version: 2.1.3.19)

7 files changed, 429 insertions, 36 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 34d10be54784..667271a4bc73 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/ptex
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.77 2008/01/18 16:29:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.78 2008/02/14 16:05:47 matsuu Exp $
+
+*ptex-3.1.10_p20080128 (14 Feb 2008)
+
+  14 Feb 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/ptex-3.1.10_p20080128-gentoo.patch, ptex-3.1.5-r1.ebuild,
+  ptex-3.1.10_p20071203.ebuild, ptex-3.1.10_p20071214.ebuild,
+  ptex-3.1.10_p20080107.ebuild, +ptex-3.1.10_p20080128.ebuild:
+  Version bumped.
+  Removed lesstif USE flag, bug #209859.
+  Clean up ebuild.
 
 *ptex-3.1.10_p20080107 (18 Jan 2008)
 
diff --git a/app-text/ptex/files/ptex-3.1.10_p20080128-gentoo.patch b/app-text/ptex/files/ptex-3.1.10_p20080128-gentoo.patch
new file mode 100644
index 000000000000..125f9a659b6c
--- /dev/null
+++ b/app-text/ptex/files/ptex-3.1.10_p20080128-gentoo.patch
@@ -0,0 +1,101 @@
+diff -Naur ptetex3-20080128.orig/2extract-src.sh ptetex3-20080128/2extract-src.sh
+--- ptetex3-20080128.orig/2extract-src.sh	2008-01-28 17:21:23.000000000 +0900
++++ ptetex3-20080128/2extract-src.sh	2008-02-14 23:50:05.000000000 +0900
+@@ -147,32 +147,32 @@
+     $CP $SRC/texk/dvipsk/* $SRC/texk/pdvipsk/ 2> /dev/null
+     $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
++#tarx archive/dvipsk-jpatch-p1.7a.tar.gz          $SRC/texk/${DVIPSK_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
+ # pTeX fontmap
+ perlprint "s/^ptexmap .*/ptexmap kanjix.map/" \
+-    $SRC/texk/${P}xdvik/texmf/xdvi.cfg
++    $SRC/texk/${DVIPSK_P}xdvik/texmf/xdvi.cfg
+ # 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 -Naur ptetex3-20080128.orig/7font-search.sh ptetex3-20080128/7font-search.sh
+--- ptetex3-20080128.orig/7font-search.sh	2008-01-28 17:44:29.000000000 +0900
++++ ptetex3-20080128/7font-search.sh	2008-02-14 23:48:35.000000000 +0900
+@@ -52,6 +52,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
+@@ -107,7 +118,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
+@@ -115,18 +127,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
+ ### リンク名  検索ディレクトリ/ファイル
diff --git a/app-text/ptex/ptex-3.1.10_p20071203.ebuild b/app-text/ptex/ptex-3.1.10_p20071203.ebuild
index a5167a9bc7fd..e75be8daebc3 100644
--- a/app-text/ptex/ptex-3.1.10_p20071203.ebuild
+++ b/app-text/ptex/ptex-3.1.10_p20071203.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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_p20071203.ebuild,v 1.8 2007/12/29 11:42:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20071203.ebuild,v 1.9 2008/02/14 16:05:47 matsuu Exp $
 
 TETEX_PV=3.0_p1
 
@@ -33,7 +33,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 BUILD_DIR="${WORKDIR}/build/usr"
 
 LICENSE="GPL-2 BSD"
-IUSE="X motif lesstif Xaw3d neXt iconv unicode"
+IUSE="X motif Xaw3d neXt iconv unicode"
 
 DEPEND="!app-text/tetex
 	!<app-text/ptetex-3.1.9
diff --git a/app-text/ptex/ptex-3.1.10_p20071214.ebuild b/app-text/ptex/ptex-3.1.10_p20071214.ebuild
index e30cb8a7ada0..8bdc2277a6f0 100644
--- a/app-text/ptex/ptex-3.1.10_p20071214.ebuild
+++ b/app-text/ptex/ptex-3.1.10_p20071214.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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_p20071214.ebuild,v 1.1 2007/12/31 14:18:51 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20071214.ebuild,v 1.2 2008/02/14 16:05:47 matsuu Exp $
 
 TETEX_PV=3.0_p1
 
@@ -33,7 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 BUILD_DIR="${WORKDIR}/build/usr"
 
 LICENSE="GPL-2 BSD"
-IUSE="X motif lesstif Xaw3d neXt iconv unicode"
+IUSE="X motif Xaw3d neXt iconv unicode"
 
 DEPEND="!app-text/tetex
 	!<app-text/ptetex-3.1.9
diff --git a/app-text/ptex/ptex-3.1.10_p20080107.ebuild b/app-text/ptex/ptex-3.1.10_p20080107.ebuild
index 32458b619dea..bb08e50e4c01 100644
--- a/app-text/ptex/ptex-3.1.10_p20080107.ebuild
+++ b/app-text/ptex/ptex-3.1.10_p20080107.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_p20080107.ebuild,v 1.1 2008/01/18 16:29:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20080107.ebuild,v 1.2 2008/02/14 16:05:47 matsuu Exp $
 
 TETEX_PV=3.0_p1
 
@@ -33,7 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 BUILD_DIR="${WORKDIR}/build/usr"
 
 LICENSE="GPL-2 BSD"
-IUSE="X motif lesstif Xaw3d neXt iconv unicode"
+IUSE="X motif Xaw3d neXt iconv unicode"
 
 RDEPEND="!app-text/tetex
 	!<app-text/ptetex-3.1.9
diff --git a/app-text/ptex/ptex-3.1.10_p20080128.ebuild b/app-text/ptex/ptex-3.1.10_p20080128.ebuild
new file mode 100644
index 000000000000..a6a9845e266a
--- /dev/null
+++ b/app-text/ptex/ptex-3.1.10_p20080128.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2008 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_p20080128.ebuild,v 1.1 2008/02/14 16:05:47 matsuu Exp $
+
+TETEX_PV=3.0_p1
+
+inherit eutils tetex-3 flag-o-matic autotools multilib
+
+SMALL_PV="${TETEX_PV/_p*}"
+TETEX_TEXMF_PV="${SMALL_PV}"
+TETEX_S="${WORKDIR}/tetex-src-${SMALL_PV}"
+
+DESCRIPTION="TeX distribution teTeX with Japanese patch collection 'ptetex3'"
+HOMEPAGE="http://www.nn.iij4u.or.jp/~tutimura/tex/ptetex.html"
+
+#TETEX_SRC="tetex-src-${TETEX_PV}.tar.gz"
+TETEX_SRC="tetex-src-${SMALL_PV}.tar.gz"
+TETEX_TEXMF="tetex-texmf-${TETEX_TEXMF_PV:-${TETEX_PV}}"
+TETEX_TEXMF_SRC="tetex-texmf-${TETEX_TEXMF_PV:-${TETEX_PV}}po.tar.gz"
+PTETEX="ptetex3-${PV/*_p}"
+PTETEX_CMAP="ptetex-cmap-20051117"
+
+SRC_PATH_TETEX="ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib"
+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/${PN}-3.1.10_p20071122-dviljk-security-fixes.patch.bz2"
+#	mirror://gentoo/tetex-${TETEX_PV}-gentoo.tar.gz
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+BUILD_DIR="${WORKDIR}/build/usr"
+
+LICENSE="GPL-2 BSD"
+IUSE="X motif Xaw3d neXt iconv unicode"
+
+RDEPEND="!app-text/tetex
+	!<app-text/ptetex-3.1.9
+	!app-text/dvipdfmx
+	!app-text/xdvik
+	media-libs/t1lib
+	media-libs/gd
+	X? (
+		>=media-libs/freetype-2.3.4
+		|| (
+			media-fonts/ja-ipafonts
+			media-fonts/ipamonafont
+			media-fonts/vlgothic
+			media-fonts/sazanami
+			media-fonts/kochi-substitute
+		)
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PTETEX}"
+
+# Sorry this provides tetex again...
+PROVIDE="virtual/tetex"
+
+src_unpack() {
+	#tetex-3_src_unpack
+	mkdir -p "${WORKDIR}/${TETEX_TEXMF}"
+	cd "${WORKDIR}/${TETEX_TEXMF}"
+	unpack ${TETEX_TEXMF_SRC}
+	cd "${WORKDIR}"
+	unpack ${TETEX_SRC}
+	cd "${WORKDIR}"
+	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 ..."
+	tar xzf "${WORKDIR}"/${PTETEX}/archive/jis.tar.gz -C "${WORKDIR}" || die
+	tar xzf "${WORKDIR}"/${PTETEX}/archive/morisawa.tar.gz -C "${WORKDIR}" || die
+
+	# Gentoo box reserves variable ${P}!!
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	cat <<EOF > "${S}"/my_option
+SRC_DIR="${WORKDIR}"
+TMP_PREFIX="${BUILD_DIR}"
+PREFIX=/usr
+DATADIR=/usr/share
+TEXMFDIST="${WORKDIR}/${TETEX_TEXMF}"
+TEXSRC_EXTRACTED="${WORKDIR}"
+#make_option vartexfonts=/var/lib/texmf
+make_option vartexfonts="${T}/texfonts"
+make_option CC="$(tc-getCC)"
+make_option CXX="$(tc-getCXX)"
+JAPANESE=international
+XDVI=echo
+PXDVI=echo
+PLATEX209=no
+conf_option --without-dviljk
+conf_option --without-dvipng
+conf_option --without-info
+conf_option --without-texi2html
+conf_option --without-texinfo
+
+conf_option --with-system-zlib
+conf_option --with-system-pnglib
+conf_option --with-system-gd
+conf_option --with-system-ncurses
+conf_option --with-system-t1lib
+conf_option --enable-shared
+EOF
+
+	if use iconv ; then
+		echo "conf_option --enable-kanji-iconv" >> "${S}"/my_option
+	fi
+
+	if use unicode ; then
+		echo "KANJI_CODE=UTF8" >> "${S}"/my_option
+	else
+		echo "KANJI_CODE=EUC" >> "${S}"/my_option
+	fi
+
+	# copied from tetex-3.eclass and modified
+	if use X ; then
+		if use motif ; then
+			append-ldflags $(motif-config --libs)
+			export CPPFLAGS="${CPPFLAGS} $(motif-config --cflags)"
+			toolkit="motif"
+		elif use neXt ; then
+			toolkit="neXtaw"
+		elif use Xaw3d ; then
+			toolkit="xaw3d"
+		else
+			toolkit="xaw"
+		fi
+		append-ldflags $(freetype-config --libs)
+		echo "export CPPFLAGS=\"${CPPFLAGS} $(freetype-config --cflags)\"" >> "${S}"/my_option
+		echo "conf_option --with-xdvi-x-toolkit=${toolkit}" >> "${S}"/my_option
+	else
+		echo "conf_option --without-x" >> "${S}"/my_option
+		echo "conf_option --without-xdvik" >> "${S}"/my_option
+		echo "conf_option --without-pxdvik" >> "${S}"/my_option
+	fi
+
+	cd "${S}"
+	unset TEXMFMAIN TEXMF HOME
+	emake -j1 x || die "emake x failed"
+
+	cd "${TETEX_S}"
+
+	epatch "${FILESDIR}/tetex-${SMALL_PV}-kpathsea-pic.patch"
+
+	# bug 85404
+	epatch "${FILESDIR}/${PN}-3.1.10_p20071122-epstopdf-wrong-rotation.patch"
+
+	# ptetex included
+	#epatch "${FILESDIR}/tetex-${TETEX_PV}-amd64-xdvik-wp.patch"
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-mptest.patch"
+
+	#bug 98029
+	# no need
+	#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}/${PN}-3.1.10_p20071122-pdftosrc-install.patch"
+
+	# bug 126918
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-create-empty-files.patch"
+
+	# bug 94901
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-dvipdfm-timezone.patch"
+
+	# security bug #170861
+	# ptetex included
+	# epatch "${FILESDIR}/tetex-${TETEX_PV}-CVE-2007-0650.patch"
+
+	# security bug #188172
+	# ptetex included
+	#epatch "${FILESDIR}/tetex-${TETEX_PV}-xpdf-CVE-2007-3387.patch"
+
+	# security bug #198238
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-dvips_bufferoverflow.patch"
+
+	# securty bug #196735
+	epatch "${FILESDIR}/xpdf-3.02pl2.patch"
+
+	# Construct a Gentoo site texmf directory
+	# that overlays the upstream supplied
+	# target not found
+	#epatch "${FILESDIR}/tetex-${TETEX_PV}-texmf-site.patch"
+
+	# security bug #198238
+	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"
+
+	cd "${TETEX_S}/texk/dviljk"
+	eautoreconf
+}
+
+src_compile() {
+	unset TEXMFMAIN TEXMF HOME
+
+	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 ..."
+	dobin "${BUILD_DIR}"/bin/*
+	dolib "${BUILD_DIR}"/lib/*
+
+	einfo "Installing /usr/include/* files ..."
+	insinto /usr/include
+	doins -r "${BUILD_DIR}"/include/*
+
+	einfo "Installing /usr/share/* files ..."
+	insinto /usr/share
+	#doins -r "${BUILD_DIR}"/share/*
+	cp -dr "${BUILD_DIR}"/share/* "${D}"/usr/share
+
+	einfo "Installing document files ..."
+	doman "${BUILD_DIR}"/man/*/*
+	doinfo "${BUILD_DIR}"/info/*
+
+	einfo "Installing jis and morisawa fonts ..."
+	insinto /usr/share/texmf/fonts/tfm
+	doins -r "${WORKDIR}"/jis/tfm/*        || die "installing jis/tfm failed"
+	doins -r "${WORKDIR}"/morisawa/tfm/*   || die "installing morisawa/tfm failed"
+
+	einfo "Installing texmf files ..."
+	find "${WORKDIR}"/${TETEX_TEXMF} -maxdepth 1 -mindepth 1 -type f | xargs rm -f
+	insinto /usr/share/texmf
+	doins -r "${WORKDIR}"/${TETEX_TEXMF}/*
+
+	einfo "Installing other files ..."
+	insinto /usr/share/texmf/fonts/map/dvips/tetex
+	doins "${WORKDIR}"/${TETEX_S}/texk/pdvipsk/psfonts_jp.map
+	#insinto /var/lib/texmf/web2c
+	insinto /usr/share/texmf/web2c
+	doins -r "${BUILD_DIR}"/share/texmf-config/web2c/*
+	doins -r "${BUILD_DIR}"/share/texmf-var/web2c/*.fmt
+
+	einfo "Removing unnecessary files ..."
+	rm -r "${D}"/usr/share/texmf/doc
+	#rm -r "${D}"/usr/share/texmf-config
+	#rm -r "${D}"/usr/share/texmf-var
+	rm -r "${D}"/usr/share/texmf/web2c/texmf.cnf.*
+	rm -r "${D}"/usr/share/texmf/web2c/fmtutil.cnf.*
+	rm -r "${D}"/usr/info/dir
+	find "${D}"/usr/share/texmf | grep "ls-R" | xargs rm -f
+
+	einfo "Installing texmf-update scripte ..."
+	dosbin "${FILESDIR}"/texmf-update
+	#einfo "Making ls-R files ..."
+	#TEXMF="${D}"/usr/share/texmf "${D}"/usr/bin/mktexlsr || die
+
+	dodoc ChangeLog* README*
+}
+
+pkg_postinst() {
+	tetex-3_pkg_postinst
+
+	elog
+	elog "Japanese dvips and xdvi have been renamed to pdvipsk and pxdvik."
+	#elog "You also need to emerge app-text/dvipdfmx to convert dvi into PDF."
+	elog
+}
diff --git a/app-text/ptex/ptex-3.1.5-r1.ebuild b/app-text/ptex/ptex-3.1.5-r1.ebuild
index a36850c1e492..189f705d3314 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-2008 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.13 2008/01/11 21:43:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.5-r1.ebuild,v 1.14 2008/02/14 16:05:47 matsuu Exp $
 
 PTEX_TEXMF_PV=2.3
 TETEX_PV=2.0.2
@@ -36,26 +36,26 @@ src_unpack() {
 	tetex-2_src_unpack
 
 	einfo "Unpacking pTeX sources..."
-	cd ${S}/texmf
+	cd "${S}"/texmf
 	unpack ${PTEX_TEXMF}
 
-	cd ${S}/texk/web2c
+	cd "${S}"/texk/web2c
 	unpack ${PTEX_SRC}
 
-	cd ${S}/texk
+	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
+		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
+			"${S}"/texk/xdvik/vfontmap.freetype || die
 		cd texk/oxdvik
 		ln -s ../xdvik/*.{c,h} ./
 		cp -f ../xdvik/Makefile.in.oxdvi Makefile.in
@@ -63,21 +63,21 @@ src_unpack() {
 	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
+	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
+	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
+	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
+	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch "${FILESDIR}"/${P}-dvi-draw-conflicting-types.patch
 
 }
 
@@ -89,7 +89,7 @@ src_compile() {
 
 	tetex_src_compile
 
-	cat >>${S}/texk/web2c/fmtutil.cnf<<-EOF
+	cat >>"${S}"/texk/web2c/fmtutil.cnf<<-EOF
 
 	# Japanese pLaTeX:
 	ptex		ptex	-		ptex.ini
@@ -97,12 +97,12 @@ src_compile() {
 	platex209	ptex	language.dat	plplain.ini
 	EOF
 
-	cat >>${S}/texk/web2c/texmf.cnf<<-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
+	cd "${S}"/texk/web2c/${PN}-src-${PV} || die
 	./configure EUC || die "configure pTeX failed"
 
 	make programs || die "make pTeX failed"
@@ -112,23 +112,23 @@ 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
+	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
+	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
+	cd "${S}"/texk/dvipsk
 	dodoc ../ChangeLog.jpatch ../README.jpatch
 
 	if use X ; then
-		cd ${S}/texk/xdvik
+		cd "${S}"/texk/xdvik
 		docinto xdvik
 		dodoc ANNOUNCE BUGS CHANGES.xdvik-jp FAQ README.*
 		docinto xdvik/READMEs