Fixed fonts handling. Fixed texmf override issue. Removed old versions.

(Portage version: 2.1.7.4/cvs/Linux x86_64)

6 files changed, 242 insertions, 538 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index e47d84893bad..171ecd918412 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/ptex
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.86 2009/11/10 14:35:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.87 2009/11/15 02:37:33 matsuu Exp $
+
+*ptex-3.1.10_p20090610-r1 (15 Nov 2009)
+
+  15 Nov 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -ptex-3.1.10_p20080128.ebuild, -ptex-3.1.10_p20080414.ebuild,
+  +ptex-3.1.10_p20090610-r1.ebuild,
+  -files/ptex-3.1.10_p20080128-gentoo.patch,
+  -files/ptex-3.1.10_p20080414-gentoo.patch,
+  +files/ptex-3.1.10_p20090610-r1-gentoo.patch:
+  Fixed fonts handling. Fixed texmf override issue. Removed old versions.
 
   10 Nov 2009; Markus Meier <maekke@gentoo.org>
   ptex-3.1.10_p20090610.ebuild:
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
deleted file mode 100644
index 125f9a659b6c..000000000000
--- a/app-text/ptex/files/ptex-3.1.10_p20080128-gentoo.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-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/files/ptex-3.1.10_p20080414-gentoo.patch b/app-text/ptex/files/ptex-3.1.10_p20080414-gentoo.patch
deleted file mode 100644
index 9da591717c5d..000000000000
--- a/app-text/ptex/files/ptex-3.1.10_p20080414-gentoo.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -Naur ptetex3-20080414.orig/2extract-src.sh ptetex3-20080414/2extract-src.sh
---- ptetex3-20080414.orig/2extract-src.sh	2008-04-11 02:34:49.000000000 +0900
-+++ ptetex3-20080414/2extract-src.sh	2008-05-10 09:23:08.000000000 +0900
-@@ -147,32 +147,32 @@
-     $MKDIR $SRC/texk/pdvipsk
-     $CP $SRC/texk/dvipsk/* $SRC/texk/pdvipsk/ 2> /dev/null
-     tarcp $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.96-p1.7b.tar.gz                $SRC/texk/${P}dvipsk
--cpatch $SRC/texk/${P}dvipsk/dvipsk-5.96-p1.7b.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.96-p1.7b.tar.gz                $SRC/texk/${DVIPSK_P}dvipsk
-+cpatch $SRC/texk/${DVIPSK_P}dvipsk/dvipsk-5.96-p1.7b.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
- perlnoprint "s/^ptexmap .*/ptexmap kanjix.map/; print unless /IPA/" \
--    $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-20080414.orig/7font-search.sh ptetex3-20080414/7font-search.sh
---- ptetex3-20080414.orig/7font-search.sh	2008-04-14 18:07:04.000000000 +0900
-+++ ptetex3-20080414/7font-search.sh	2008-05-10 09:36:33.000000000 +0900
-@@ -58,6 +58,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
-@@ -111,10 +122,10 @@
- 
- mksymlink $CMAP <<EOF
- ### リンク名  検索ディレクトリ/ファイル
--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
--Acrobat8    /usr{,/local,/sfw}{,/lib}{,/Adobe}/Acrobat8.0/Resource/CMap
-+Acrobat4    {/opt,/usr{,/local,/sfw}{,/lib}}/Acrobat4/Resource/CMap
-+Acrobat5    {/opt,/usr{,/local,/sfw}{,/lib}}/Acrobat5/Resource/Font
-+Acrobat7    {/opt,/usr{,/local,/sfw}{,/lib}}{,/Adobe}/Acrobat7{,.0}/Resource/CMap
-+Acrobat8    {/opt,/usr{,/local,/sfw}{,/lib}}{,/Adobe}/{Acrobat,Reader}8{,.0}/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
-@@ -122,21 +133,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
--truetype  /usr{,/local}/share/fonts/truetype
--TrueType  /usr{,/local}/share/fonts/TrueType
--TTF	  /usr{,/local}/share/fonts/TTF
--ja        /usr{,/local}/share/fonts/ja/TrueType
--japanese  /usr{,/local}/share/fonts/japanese/TrueType
--openwin   /usr/openwin/lib/locale/ja/X11/fonts/TT
--QtPalmtop /opt/QtPalmtop/lib/X11/fonts/TrueType
--f8sazanami-min  /usr/share/fonts/sazanami-fonts-mincho
--f8sazanami-goth /usr/share/fonts/sazanami-fonts-gothic
--EOF
-+mksymlink_gentoo
- 
- mksymlink $OPENTYPE <<EOF
- ### リンク名  検索ディレクトリ/ファイル
-diff -Naur ptetex3-20080414.orig/common.sh ptetex3-20080414/common.sh
---- ptetex3-20080414.orig/common.sh	2008-04-05 17:51:07.000000000 +0900
-+++ ptetex3-20080414/common.sh	2008-05-10 09:47:00.000000000 +0900
-@@ -220,12 +220,12 @@
- 	echo "You are root."
- 	echo "It is RECOMMENDED to execute by a user."
- 	echo "Executing by root may cause SERIOUS DAMAGE for your system."
--	echo -n "Are you sure to execute by root AT YOUR OWN RISK? (yes/NO) "
--	read REPLY
--	case $REPLY in
--	    yes) ;;
--	    *) exit 1;;
--	esac
-+#	echo -n "Are you sure to execute by root AT YOUR OWN RISK? (yes/NO) "
-+#	read REPLY
-+#	case $REPLY in
-+#	    yes) ;;
-+#	    *) exit 1;;
-+#	esac
-     fi
- }
- 
diff --git a/app-text/ptex/files/ptex-3.1.10_p20090610-r1-gentoo.patch b/app-text/ptex/files/ptex-3.1.10_p20090610-r1-gentoo.patch
new file mode 100644
index 000000000000..ca5bb179136d
--- /dev/null
+++ b/app-text/ptex/files/ptex-3.1.10_p20090610-r1-gentoo.patch
@@ -0,0 +1,192 @@
+diff -Naur ptetex3-20090610.orig/2extract-src.sh ptetex3-20090610/2extract-src.sh
+--- ptetex3-20090610.orig/2extract-src.sh	2009-06-07 17:00:07.000000000 +0900
++++ ptetex3-20090610/2extract-src.sh	2009-11-12 00:23:18.635898734 +0900
+@@ -147,25 +147,25 @@
+     $MKDIR $SRC/texk/pdvipsk
+     $CP $SRC/texk/dvipsk/* $SRC/texk/pdvipsk/ 2> /dev/null
+     tarcp $SRC/texk/xdvik $SRC/texk/pxdvik
+-    P=p
++    DVIPSK_P=p
+ fi # "$JAPANESE" = "international"
+ ## for dvipsk
+-#tarx archive/dvipsk-jpatch-p*.tar.gz         $SRC/texk/${P}dvipsk
+-#cpatch $SRC/texk/${P}dvipsk/dvipsk-*.patch 1 $SRC/texk/${P}dvipsk
+-tarx archive/dvipsk-*-p*.tar.gz              $SRC/texk/${P}dvipsk
+-cpatch $SRC/texk/${P}dvipsk/dvipsk-*.diff 1  $SRC/texk/${P}dvipsk
+-perlprint 's/^kpse_include/ac_include/g'     $SRC/texk/${P}dvipsk/Makefile.in
++#tarx archive/dvipsk-jpatch-p*.tar.gz         $SRC/texk/${DVIPSK_P}dvipsk
++#cpatch $SRC/texk/${DVIPSK_P}dvipsk/dvipsk-*.patch 1 $SRC/texk/${DVIPSK_P}dvipsk
++tarx archive/dvipsk-*-p*.tar.gz              $SRC/texk/${DVIPSK_P}dvipsk
++cpatch $SRC/texk/${DVIPSK_P}dvipsk/dvipsk-*.diff 1  $SRC/texk/${DVIPSK_P}dvipsk
++perlprint 's/^kpse_include/ac_include/g'     $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
+ perlnoprint "s/^ptexmap .*/ptexmap kanjix.map/; print unless /IPA/" \
+-    $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-20090610.orig/3extract-texmf.sh ptetex3-20090610/3extract-texmf.sh
+--- ptetex3-20090610.orig/3extract-texmf.sh	2009-06-10 17:10:51.000000000 +0900
++++ ptetex3-20090610/3extract-texmf.sh	2009-11-12 01:28:53.475843907 +0900
+@@ -85,8 +85,8 @@
+ $CP $MAP/ptex-noEmbed.map $MAP/ptex-morisawa.map
+ perlprint "s/min/\!Ryumin-Light/g;
+ 	  s/goth/\!GothicBBB-Medium/g;"   $MAP/ptex-noEmbed.map
+-perlprint "s/min/ipam.ttf/g;
+-	  s/goth/ipag.ttf/g;"             $MAP/ptex-ipa.map
++perlprint "s/min/ipam.otf/g;
++	  s/goth/ipag.otf/g;"             $MAP/ptex-ipa.map
+ perlprint "s/min/HiraMinPro-W3/g;
+ 	  s/goth/HiraKakuPro-W6/g;"       $MAP/ptex-hiragino.map
+ perlprint "s/min/KozMinPro-Regular-Acro.otf/g;
+diff -Naur ptetex3-20090610.orig/4make-install.sh ptetex3-20090610/4make-install.sh
+--- ptetex3-20090610.orig/4make-install.sh	2009-05-05 01:35:49.000000000 +0900
++++ ptetex3-20090610/4make-install.sh	2009-11-12 00:23:18.635898734 +0900
+@@ -44,11 +44,9 @@
+ 
+ echo "[--tetex--] configure"
+ cd $SRC || exit
+-$MKDIR $PREFIX/share/texmf 2> /dev/null # avoid warning of texmf tree
+ ./configure --prefix=$PREFIX --datadir=$DATADIR \
+     --disable-multiplatform --with-ptexenc=$KANJI_CODE \
+     $CONF_OPTION || exit
+-$RMDIR $PREFIX/share/texmf 2> /dev/null # avoid warning of texmf tree
+ xdvi_check
+ echo "[--tetex--] make"
+ $MAKE $MAKE_OPTION || exit
+diff -Naur ptetex3-20090610.orig/5macro.sh ptetex3-20090610/5macro.sh
+--- ptetex3-20090610.orig/5macro.sh	2008-04-17 14:30:43.000000000 +0900
++++ ptetex3-20090610/5macro.sh	2009-11-12 01:29:22.365322180 +0900
+@@ -104,8 +104,8 @@
+ hkbv        V                 !GothicBBB-Medium
+ EOF
+ 
+-perl -pe 's/\!Ryumin-Light/ipam.ttf/g; 
+-	  s/\!GothicBBB-Medium/ipag.ttf/g;' \
++perl -pe 's/\!Ryumin-Light/ipam.otf/g; 
++	  s/\!GothicBBB-Medium/ipag.otf/g;' \
+ 	      < $MAP/utf-noEmbed.map > $MAP/utf-ipa.map
+ perl -pe 's/\!Ryumin-Light/HiraMinPro-W3/g; 
+ 	  s/\!GothicBBB-Medium/HiraKakuPro-W6/g;' \
+@@ -197,8 +197,8 @@
+ hmgothr-v	V			!Ryumin-Light
+ EOF
+ 
+-perl -pe 's/\!Ryumin-Light/ipam.ttf/g; 
+-	  s/\!GothicBBB-Medium/ipag.ttf/g;' \
++perl -pe 's/\!Ryumin-Light/ipam.otf/g; 
++	  s/\!GothicBBB-Medium/ipag.otf/g;' \
+ 	      < $MAP/otf-noEmbed.map > $MAP/otf-ipa.map
+ 
+ cat <<EOF > $MAP/otf-cktx.map || exit
+diff -Naur ptetex3-20090610.orig/7font-search.sh ptetex3-20090610/7font-search.sh
+--- ptetex3-20090610.orig/7font-search.sh	2008-06-16 13:06:07.000000000 +0900
++++ ptetex3-20090610/7font-search.sh	2009-11-12 00:23:18.635898734 +0900
+@@ -58,6 +58,26 @@
+     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
++    $MKDIR $OPENTYPE
++    find $fonts_dir -maxdepth 1 -mindepth 1 -type d | while read font_path; do
++	if [ `find $font_path -maxdepth 1 -type f -iname '*.otf' | wc -l` -gt 0 ]; then
++	    font_name=${font_path/$fonts_dir/}
++	    test -h ${OPENTYPE}/${font_name} && continue
++	    $LN "${font_path}" "${OPENTYPE}/${font_name}"
++	fi
++    done
++
++}
+ 
+ setrmlgbm() {
+     if test -n "$2"; then
+@@ -111,10 +131,10 @@
+ 
+ mksymlink $CMAP <<EOF
+ ### リンク名  検索ディレクトリ/ファイル
+-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
+-Acrobat8    /usr{,/local,/sfw}{,/lib}{,/Adobe}/Acrobat8.0/Resource/CMap
++Acrobat4    {/opt,/usr{,/local,/sfw}{,/lib}}/Acrobat4/Resource/CMap
++Acrobat5    {/opt,/usr{,/local,/sfw}{,/lib}}/Acrobat5/Resource/Font
++Acrobat7    {/opt,/usr{,/local,/sfw}{,/lib}}{,/Adobe}/Acrobat7{,.0}/Resource/CMap
++Acrobat8    {/opt,/usr{,/local,/sfw}{,/lib}}{,/Adobe}/{Acrobat,Reader}8{,.0}/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
+@@ -122,21 +142,7 @@
+ openwintw   /usr/openwin/lib/locale/zh_TW.BIG5/X11/Resource/CMap
+ EOF
+ 
+-mksymlink $TRUETYPE <<EOF
+-### リンク名  検索ディレクトリ/ファイル
+-x11       /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/truetype
+-X11       /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/TrueType
+-X11TTF    /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/TTF
+-truetype  /usr{,/local}/share/fonts/truetype
+-TrueType  /usr{,/local}/share/fonts/TrueType
+-TTF	  /usr{,/local}/share/fonts/TTF
+-ja        /usr{,/local}/share/fonts/ja/TrueType
+-japanese  /usr{,/local}/share/fonts/japanese/TrueType
+-openwin   /usr/openwin/lib/locale/ja/X11/fonts/TT
+-QtPalmtop /opt/QtPalmtop/lib/X11/fonts/TrueType
+-f8sazanami-min  /usr/share/fonts/sazanami-fonts-mincho
+-f8sazanami-goth /usr/share/fonts/sazanami-fonts-gothic
+-EOF
++mksymlink_gentoo
+ 
+ mksymlink $OPENTYPE <<EOF
+ ### リンク名  検索ディレクトリ/ファイル
+@@ -222,6 +228,8 @@
+ # IPA font http://ossipedia.ipa.go.jp/ipafont/
+ 	ipam.ttf
+ 	ipag.ttf
++	ipam.otf
++	ipag.otf
+ # DynaLab
+ 	dfmimp3.ttc
+ 	dfgotp5.ttc
+diff -Naur ptetex3-20090610.orig/common.sh ptetex3-20090610/common.sh
+--- ptetex3-20090610.orig/common.sh	2009-05-04 18:32:26.000000000 +0900
++++ ptetex3-20090610/common.sh	2009-11-12 00:23:18.635898734 +0900
+@@ -221,12 +221,12 @@
+ 	echo "You are root."
+ 	echo "It is RECOMMENDED to execute by a user."
+ 	echo "Executing by root may cause SERIOUS DAMAGE for your system."
+-	echo -n "Are you sure to execute by root AT YOUR OWN RISK? (yes/NO) "
+-	read REPLY
+-	case $REPLY in
+-	    yes) ;;
+-	    *) exit 1;;
+-	esac
++#	echo -n "Are you sure to execute by root AT YOUR OWN RISK? (yes/NO) "
++#	read REPLY
++#	case $REPLY in
++#	    yes) ;;
++#	    *) exit 1;;
++#	esac
+     fi
+ }
+ 
diff --git a/app-text/ptex/ptex-3.1.10_p20080414.ebuild b/app-text/ptex/ptex-3.1.10_p20080414.ebuild
deleted file mode 100644
index 03aead3b531e..000000000000
--- a/app-text/ptex/ptex-3.1.10_p20080414.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# 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_p20080414.ebuild,v 1.2 2008/10/31 21:08:57 ulm 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}"
-
-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
-			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.10_p20080128.ebuild b/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild
index 12934ea7cc15..7f855e966491 100644
--- a/app-text/ptex/ptex-3.1.10_p20080128.ebuild
+++ b/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3 2008/10/31 21:08:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20090610-r1.ebuild,v 1.1 2009/11/15 02:37:33 matsuu Exp $
+
+# jmbreuer FOR DEV ONLY
+RESTRICT="mirror test"
 
 TETEX_PV=3.0_p1
 
@@ -13,20 +16,18 @@ 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"
+PTETEX_CMAP="ptetex-cmap-20090506"
 
-SRC_PATH_TETEX="ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib"
+SRC_PATH_TETEX="http://www.ctan.org/tex-archive/obsolete/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"
 
@@ -39,12 +40,15 @@ RDEPEND="!app-text/tetex
 	!<app-text/ptetex-3.1.9
 	!app-text/dvipdfmx
 	!app-text/xdvik
+	!dev-texlive/texlive-basic
+	!dev-texlive/texlive-latex
+	!dev-texlive/texlive-latexrecommended
 	media-libs/t1lib
 	media-libs/gd
 	X? (
 		>=media-libs/freetype-2.3.4
 		|| (
-			media-fonts/ja-ipafonts
+			>=media-fonts/ja-ipafonts-003.01
 			media-fonts/ipamonafont
 			media-fonts/vlgothic
 			media-fonts/sazanami
@@ -57,7 +61,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PTETEX}"
 
 src_unpack() {
-	#tetex-3_src_unpack
 	mkdir -p "${WORKDIR}/${TETEX_TEXMF}"
 	cd "${WORKDIR}/${TETEX_TEXMF}"
 	unpack ${TETEX_TEXMF_SRC}
@@ -73,7 +76,7 @@ src_unpack() {
 
 	# Gentoo box reserves variable ${P}!!
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PF}-gentoo.patch
 
 	cat <<EOF > "${S}"/my_option
 SRC_DIR="${WORKDIR}"
@@ -87,9 +90,11 @@ make_option vartexfonts="${T}/texfonts"
 make_option CC="$(tc-getCC)"
 make_option CXX="$(tc-getCXX)"
 JAPANESE=international
+EXTRA_TRUETYPE="/usr/share/fonts/ja-ipafonts"
 XDVI=echo
 PXDVI=echo
 PLATEX209=no
+STRIP=no
 conf_option --without-dviljk
 conf_option --without-dvipng
 conf_option --without-info
@@ -125,8 +130,8 @@ EOF
 		else
 			toolkit="xaw"
 		fi
-		append-ldflags $(freetype-config --libs)
 		echo "export CPPFLAGS=\"${CPPFLAGS} $(freetype-config --cflags)\"" >> "${S}"/my_option
+		echo "export LDFLAGS=\"${LDFLAGS} $(freetype-config --libs)\"" >> "${S}"/my_option
 		echo "conf_option --with-xdvi-x-toolkit=${toolkit}" >> "${S}"/my_option
 	else
 		echo "conf_option --without-x" >> "${S}"/my_option
@@ -191,6 +196,11 @@ EOF
 	# security bug #198238 and bug #193437
 	epatch "${FILESDIR}/tetex-${TETEX_PV}-t1lib-SA26241_buffer_overflow.patch"
 
+	# security bug #282874
+	epatch "${FILESDIR}/CVE-2009-1284.patch"
+
+	epatch "${FILESDIR}/${P}-getline.patch"
+
 	cd "${TETEX_S}/texk/dviljk"
 	eautoreconf
 }
@@ -206,15 +216,25 @@ src_compile() {
 
 	einfo "Setting ptetex-cmap ..."
 	cd "${WORKDIR}/${PTETEX_CMAP}"
-	PATH="${BUILD_DIR}/bin:$PATH" ./setup.sh "${BUILD_DIR}"/share/texmf/fonts/cmap
+	PATH="${BUILD_DIR}/bin:${PATH}" \
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+	TEXMFMAIN="${BUILD_DIR}/share/texmf" \
+		./setup.sh "${BUILD_DIR}"/share/texmf/fonts/cmap
 }
 
 src_test() {
-	emake -j1 test || die "emake test failed"
+	PATH="${BUILD_DIR}/bin:${PATH}" \
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+	TEXMFMAIN="${BUILD_DIR}/share/texmf" \
+		emake -j1 test || die "emake test failed"
 }
 
 src_install() {
-	#tetex-3_src_install
+	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 ptetex3 binaries ..."
 	dobin "${BUILD_DIR}"/bin/*
 	dolib "${BUILD_DIR}"/lib/*
@@ -225,7 +245,6 @@ src_install() {
 
 	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 ..."
@@ -237,32 +256,19 @@ src_install() {
 	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*
 }
@@ -272,6 +278,11 @@ 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
+	elog "To use proper Japanese font in dvips/dvipdfmx/xdvi/pdftex, you"
+	elog "needs to run updmap or updmap-sys w/ map. More deteil info about"
+	elog "this fonts central configuration can be available at following"
+	elog "ptetex Wiki:"
+	elog " http://tutimura.ath.cx/ptetex/?%A5%D5%A5%A9%A5%F3%A5%C8%A4%CE%BD%B8%C3%E6%B4%C9%CD%FD"
 	elog
 }