Version bumped.

Removed lesstif USE flag, bug #209859.
Clean up ebuild.
Package-Manager: portage-2.1.3.19

8 files changed, 437 insertions, 41 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/Manifest b/app-text/ptex/Manifest
index 69d2820acd54..6d6766c79745 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -7,6 +7,7 @@ AUX ptex-3.1.10_p20071122-epstopdf-wrong-rotation.patch 627 RMD160 73c26696f3efe
 AUX ptex-3.1.10_p20071122-fmtutil-etex.patch 863 RMD160 9759c4c21155d215e9c2e0b850a9c81910cba61d SHA1 225b2fdeb4ac88061bde595c201d6eac83e1eca7 SHA256 1b035213c3f794a518aba4f109cd0aced2d3f7b3826f6609d91b6e87307693e3
 AUX ptex-3.1.10_p20071122-pdftosrc-install.patch 979 RMD160 08544f56b48be70f974d1ab318fdeaa9fcbae362 SHA1 3d7e7875503ee438c950947cef9ca44cc8801c7c SHA256 0f89361cadccbc3a47b525b9138640b7d7ef00544291586d2c760e459743d7cd
 AUX ptex-3.1.10_p20071203-gentoo.patch 4337 RMD160 ffe5b5d6dd9dc203541d99f8249c3bb5f8dd5296 SHA1 14d6686c9ffd47050e3f0281c7bdd242481a4ce7 SHA256 c3d7fab82f264d4aee70ae27aeca2f8c2615a3910715d17894ead9ccca9e6540
+AUX ptex-3.1.10_p20080128-gentoo.patch 4581 RMD160 d357307f274da25dba08862e6c04b26006174afa SHA1 330f274033d2d365b6baf5df245b243c3cbdc16f SHA256 016a45c65141faf0fd2e5f06e96a089c8711a6b0007b1803fa508c85f0bc29f0
 AUX ptex-3.1.5-dvi-draw-conflicting-types.patch 410 RMD160 8417f8ee01a46fe1c066d7fd2cd20c7f33ab0a52 SHA1 ff903e1b682d320eb10f17da49146e680953c02b SHA256 5f6a525bb57f25a722178716e142a6555058903be0ce3944263b424896941126
 AUX ptex-3.1.5-flex-unput.patch 498 RMD160 834d9c73bcbd2cecedd51c31b38e742e6919b31f SHA1 e2c95d2ddf811647f0dae5eb977b2b5555ce2233 SHA256 40305736699ab42b68203b43483f669aee57b98dad5ee60eb05d19d8e5d7652d
 AUX ptex-xdvi-vfontmap-ja-ipafonts 3557 RMD160 5a4d1ce348071e637e36244e652a4e14f6dc1f69 SHA1 682f21c7afeabe17c9e5193b0fb0e908d3c03045 SHA256 6fec125126b185911e3fdb37135505c4b7a9bc9135b5c2ba28d36d2c0316eec1
@@ -32,6 +33,7 @@ DIST ptetex-cmap-20051117.tar.gz 4061363 RMD160 a9b4468979efc8b65161ce7deb7cd00d
 DIST ptetex3-20071203.tar.gz 6210522 RMD160 4e4719d81218eb6dfabbb5aab68b21f4a1a54cbd SHA1 79aa0bef26c2ef3c1c2a3093a1363976ca48dabb SHA256 f407ef36b174e23e0a8cbd904ac159348f9cebe958b33c5dff389cc9810d4203
 DIST ptetex3-20071214.tar.gz 6230299 RMD160 248bb8df2718f67e2edff00ed79cc76a3f336e93 SHA1 0b30d2a0b1006925822f16142db18700c871217e SHA256 dd7be836e75009a0f029fbbabc0739d6e2bdd026b2480cc138560cd0b42fcc97
 DIST ptetex3-20080107.tar.gz 6233405 RMD160 b4fbd510a9de0ee3f7a8753608d8b2dca3203ea3 SHA1 4eabfd79bc768c4faf3afa2373055963ab4007c1 SHA256 7172f7fda3b8eff6fe162f4f0f6d3569d6d0301f9e8606be2eaf23e173a56eb3
+DIST ptetex3-20080128.tar.gz 6234542 RMD160 452444d1661844064150dd5eedf3527cf73f795d SHA1 383523ad038700494dc37736e37533eb08f1716f SHA256 79d3288ff81d7ee16d8ffba30ad86d2275893818ef02039ae06516c40920bb3e
 DIST ptex-3.1.10_p20071122-dviljk-security-fixes.patch.bz2 8739 RMD160 7a63ebf1ebce0dbd7d48d9dbef2ea663ba187871 SHA1 9dad652088e93a5a6924460bd6c60efe88e9e80b SHA256 af6b92ee2640e754fc3e0b55e8aa7c8436d655f0d38e5afdd3badf5ee5f55c93
 DIST ptex-src-3.1.5.tar.gz 122201 RMD160 b3f02418917f97c3c082f524b8a50447e601db72 SHA1 eb0d2b8a72ee4f4708c86a45b62478939f76c904 SHA256 67e2ef7de02938cf480d213b01af467753bb5f87eb0662cdb38f6a8a2cd7dedd
 DIST ptex-texmf-2.3.tar.gz 1866282 RMD160 004291050ad6d726fca6a6a371e30341d4658331 SHA1 a79fac215304ee622eed5fc1403fd59061aaf1e5 SHA256 b4ab3c8abd5a4b935d0a5b2738fd691012c01567190b8551f3b0ec0dbc04de34
@@ -44,9 +46,10 @@ DIST tetex-texmf-2.0.2.tar.gz 52424280 RMD160 ff88622c2d97416a4f67fbdf7a00d837af
 DIST tetex-texmf-3.0po.tar.gz 91402377 RMD160 a1e87733fa3cbef04e39a690ed8549aeaaddb241 SHA1 1be97f57a26a6e9b72ebfd932e45914a959aff16 SHA256 6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2
 DIST tetex-texmfsrc-2.0.2.tar.gz 22909537 RMD160 bc444152b2f45cf3c0a743f6416134e31e8635b4 SHA1 59c5a328800225c44beec9a9baf0f4223ac633c3 SHA256 9348f10c9e95fdb5e9a9702956cfce38be42c48621fcfc6c9ae192363e08d267
 DIST xdvik-22.40y1-j1.21.patch.gz 166908 RMD160 4f84b62c418b2a7d3d07b7f9d60420ccbbfb479e SHA1 b952f94824c519df25a33c80347e6fa93309b6a6 SHA256 d7cd93e1b32e82dab39fbabdc0a67d0a06f291a854e82a29a1ee97f9f61bcf8f
-EBUILD ptex-3.1.10_p20071203.ebuild 8008 RMD160 7e47c31f41308a99323b5e6e033795f9aa4dc281 SHA1 2602012b9358785fdf57149d020db94f19a2a32a SHA256 b908e1c8a262e2d21156f150197fbf74ae4bf38592b89779c03f84dce52543e4
-EBUILD ptex-3.1.10_p20071214.ebuild 8036 RMD160 a148e84ef0d1f91ddd69d67bf9e690dc3bf31466 SHA1 da2a7c8ff6a122e7627b6a5f71c346ad88d80849 SHA256 c89d7ac0ec150f258a89a437e2b1bbde9f72eba301142321d138f18269c6a39e
-EBUILD ptex-3.1.10_p20080107.ebuild 8100 RMD160 6030af3738cf2c91b58dd65a13e2c70860209036 SHA1 486a38f94baa3af1516834eaf9e016168ba10cab SHA256 7447d3d36672bcede192a26fd4eb7b6bf7eb79eda3179e618a8fe1c0bbcd336d
-EBUILD ptex-3.1.5-r1.ebuild 3851 RMD160 dfb62992993bba7febd8c643d5a83b9a8a21b8db SHA1 4d8e68a9760d8b7aa6e011dbda3a8ef3fe2cae64 SHA256 c377c4439dad8d810a43e608431acbac138384bc887543f1fcc83450083c0b79
-MISC ChangeLog 12255 RMD160 159d85752d5bf364b17fee6f6ecf0c765a764160 SHA1 cf84683fa2bc16fe9c1d8c4abc8dfd7bd6d12427 SHA256 c74955eb731ed72a8f74fb945a1a7f42078bebe1e1d4610815782ad79e714b0f
+EBUILD ptex-3.1.10_p20071203.ebuild 8000 RMD160 1707e736b7612eb5dae09c5d4f11e4415bbe9255 SHA1 ea44a67810df96f70fd570e7d85bcdde5a3cb117 SHA256 5f8db668f2c49a4dfd05644676dcca6f1ede3c08548d51210f97fccd846a53c4
+EBUILD ptex-3.1.10_p20071214.ebuild 8028 RMD160 96c66c3dc0c547a41863001bdbc9dc2562571b33 SHA1 f7b59a1578b237214b42870f38c0f196d6513f41 SHA256 92318a13b464a0967a7772e46b0bc6b4d0cfe5a606ac8388847a636417521aca
+EBUILD ptex-3.1.10_p20080107.ebuild 8092 RMD160 da4d0f577ce442abcf05b31febf0a9bfb5b30e88 SHA1 bd173440073ce62beb9cdb50d206722cd4a99f1c SHA256 dbfaf6036c36f07d166227281224a306b425eafa814eb4011f86a999490ea6a7
+EBUILD ptex-3.1.10_p20080128.ebuild 8074 RMD160 4ccf630972dda555492db6a6d9290d4b8a5ba68a SHA1 68092ed252d447ba061a9b4cad7fb1252b69b0b4 SHA256 e8c130a0da083fe00fd1da8504c1d44e85f68bd03dbdf7b6fba340b2b16c80f5
+EBUILD ptex-3.1.5-r1.ebuild 3918 RMD160 7e0050561578dc98e8bfa72826c631bc5579f981 SHA1 6aecca836a6ab066f3e5af2b210af937f98b5a50 SHA256 459ca350c2efc1d150ff2892a8636f228d713f4c30d2384db0d2a5d8d2af388d
+MISC ChangeLog 12613 RMD160 b3476d183b7b00c68d7233d76e761af5ab6b571e SHA1 243ceffb886b449a25d190dd7efbfbc9bed92035 SHA256 92b43305ea9b45ad83c0d99b69669d0642b2f34e1fc7ce054181527d9afc27ca
 MISC metadata.xml 450 RMD160 910d918b9fe476cdb72c633a1c5532549d3f6114 SHA1 33ca5b367c7d2f1d470d8c18afc11230b501da89 SHA256 b9d2baa3e5a641dd35a68feed6752e874b2131480d63989ef5830080a942608b
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