Removed old versions.

(Portage version: 2.1.4.4)

20 files changed, 16 insertions, 1572 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 667271a4bc73..172e462deba0 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,21 @@
 # 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.78 2008/02/14 16:05:47 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.79 2008/02/21 16:27:08 matsuu Exp $
+
+  21 Feb 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/xpdf-2.02pl1-CAN-2005-3191-3.patch,
+  -files/xpdf-3.00pl2-CAN-2004-1125.patch,
+  -files/xpdf-3.00pl3-CAN-2005-0064.patch, -files/20fmtutil-platex.cnf,
+  -files/xdvi-xorg-7.0.patch, -files/20updmap-ja.cfg,
+  -files/ptex-3.1.5-dvi-draw-conflicting-types.patch,
+  -files/ptex-3.1.5-flex-unput.patch,
+  -files/xpdf-CESA-2004-007-xpdf2-newer.diff, -files/20texmf-cmap.cnf,
+  -files/10texmf-ptex.cnf, -files/ptex-xdvi-vfontmap-ja-ipafonts,
+  -files/ptex-xdvi-vfontmap-kochi-substitute, -files/xdvizilla.patch,
+  -files/xpdf-goo-sizet.patch, -files/xpdf2-underflow.patch,
+  -ptex-3.1.5-r1.ebuild, -ptex-3.1.10_p20071214.ebuild,
+  -ptex-3.1.10_p20080107.ebuild:
+  Removed old versions.
 
 *ptex-3.1.10_p20080128 (14 Feb 2008)
 
diff --git a/app-text/ptex/files/10texmf-ptex.cnf b/app-text/ptex/files/10texmf-ptex.cnf
deleted file mode 100644
index 7c80a7534e33..000000000000
--- a/app-text/ptex/files/10texmf-ptex.cnf
+++ /dev/null
@@ -1,20 +0,0 @@
-% -- ptex configuration params added by texmf-update --
-
-% pTeX.
-ptex_inputs = .;$TEXMF/{ptex,tex}/{plain,generic,}//
-platex209_inputs = .;$TEXMF/{ptex,tex}/{platex209,plain,platex,}//
-platex2e_inputs = .;$TEXMF/{ptex,tex}/{platex,latex,generic,}//
-TEXINPUTS.platex209 = $platex209_inputs
-TEXINPUTS.platex-sjis = $platex2e_inputs
-TEXINPUTS.platex-euc = $platex2e_inputs
-TEXINPUTS.platex-jis = $platex2e_inputs
-TEXINPUTS.platex = $platex2e_inputs
-TEXINPUTS.ptex-sjis = $ptex_inputs
-TEXINPUTS.ptex-euc = $ptex_inputs
-TEXINPUTS.ptex-jis = $ptex_inputs
-TEXINPUTS.ptex = $ptex_inputs
-
-BIBINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bib//
-BSTINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bst//
-
-% -- ptex configuration ends here --
diff --git a/app-text/ptex/files/20fmtutil-platex.cnf b/app-text/ptex/files/20fmtutil-platex.cnf
deleted file mode 100644
index 567c6e227bfc..000000000000
--- a/app-text/ptex/files/20fmtutil-platex.cnf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# 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
deleted file mode 100644
index 72a6b465abeb..000000000000
--- a/app-text/ptex/files/20texmf-cmap.cnf
+++ /dev/null
@@ -1,3 +0,0 @@
-
-CMAPINPUTS = .;/usr/share/ghostscript//;/opt/Acrobat5/Resource//;/opt/Acrobat7/Resource//;/usr/share/xpdf//
-
diff --git a/app-text/ptex/files/20updmap-ja.cfg b/app-text/ptex/files/20updmap-ja.cfg
deleted file mode 100644
index 918a3768f3a5..000000000000
--- a/app-text/ptex/files/20updmap-ja.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# Japanese fonts
-MixedMap psfonts-ja.map
-
diff --git a/app-text/ptex/files/ptex-3.1.5-dvi-draw-conflicting-types.patch b/app-text/ptex/files/ptex-3.1.5-dvi-draw-conflicting-types.patch
deleted file mode 100644
index c38a8e01bc71..000000000000
--- a/app-text/ptex/files/ptex-3.1.5-dvi-draw-conflicting-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tetex-src-2.0.2.old/texk/xdvik/dvi-draw.c      2003-01-25 05:16:33.000000000 -0500
-+++ tetex-src-2.0.2/texk/xdvik/dvi-draw.c  2006-01-08 04:52:44.000000000 -0500
-@@ -518,7 +518,7 @@
-
- #endif /* T1LIB */
-
--extern void home();  /* from events.c */
-+extern void home(wide_bool scrl);  /* from events.c */
- extern int fallbacktfm; /* from tfmload.c */
-
- static struct frame frame0;    /* dummy head of list */
diff --git a/app-text/ptex/files/ptex-3.1.5-flex-unput.patch b/app-text/ptex/files/ptex-3.1.5-flex-unput.patch
deleted file mode 100644
index 57a037e09ba6..000000000000
--- a/app-text/ptex/files/ptex-3.1.5-flex-unput.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr tetex-src-2.0.2.old/texk/web2c/omegafonts/Makefile.in tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in
---- tetex-src-2.0.2.old/texk/web2c/omegafonts/Makefile.in	2001-11-10 14:42:37.000000000 +0100
-+++ tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in	2006-02-13 12:38:48.000000000 +0100
-@@ -40,7 +40,7 @@
- 	-test -f y.tab.h && mv -f y.tab.h y_tab.h
- $(LEX_OUTPUT_ROOT).o: parser.h
- $(LEX_OUTPUT_ROOT).c: pl.l
--	$(LEX) $(srcdir)/pl.l
-+	cp $(srcdir)/lex.yy.c-dist $(srcdir)/lex.yy.c
- 
- 
- 
diff --git a/app-text/ptex/files/ptex-xdvi-vfontmap-ja-ipafonts b/app-text/ptex/files/ptex-xdvi-vfontmap-ja-ipafonts
deleted file mode 100644
index 7f0c5d10ca1e..000000000000
--- a/app-text/ptex/files/ptex-xdvi-vfontmap-ja-ipafonts
+++ /dev/null
@@ -1,126 +0,0 @@
-%
-% Sample "vfontmap"
-%
-
-% [single style]
-% "tfm" "enc" "font"
-
-% [multi style]
-% "/font/file/name"
-%    "tfm1" "enc"
-%    "tfm2" "enc"
-
-% "enc" is one of following.
-% "JIS-H" "Unicode-H" "Identity-H"
-% "JIS-V" "Unicode-V" "Identity-V"
-
-
-%/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
-%/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-%/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf
-/usr/share/fonts/ja-ipafonts/ipam.ttf
-	rml  JIS-H
-	rmlv JIS-V
-%/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
-%/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-%/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf
-/usr/share/fonts/ja-ipafonts/ipag.ttf
-	gbm  JIS-H
-	gbmv JIS-V
-
-min     JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
-nmin    JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
-goth    JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-tmin    JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
-tgoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-ngoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-jis     JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
-jisg    JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-dm      JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
-dg      JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-mgoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-fmin    JIS-H /usr/share/fonts/ja-ipafonts/ipam.ttf
-fgoth   JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-maru	JIS-H /usr/share/fonts/ja-ipafonts/ipag.ttf
-
-% UTF package
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
-	unijmin-h  Unicode-H    % \UTF font
-	unijmin-v  Unicode-V    % \UTF font
-	cidmin-h   Identity-H   % \CID font
-	cidmin-v   Identity-V   % \CID font
-	hmr        JIS-H
-	hmrv       JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
-	unijgoth-h  Unicode-H   % \UTF font
-	unijgoth-v  Unicode-V   % \UTF font
-	cidgoth-h   Identity-H  % \CID font
-	cidgoth-v   Identity-V  % \CID font
-	hkb         JIS-H
-	hkbv        JIS-V
-
-% OTF package
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
-	otf-ujmr-h  Unicode-H
-	otf-ujmr-v  Unicode-V
-	otf-cjmr-h  Identity-H
-	otf-cjmr-v  Identity-V
-	hminr-h     JIS-H
-	hminr-v     JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
-	otf-ujgr-h  Unicode-H
-	otf-ujgr-v  Unicode-V
-	otf-cjgr-h  Identity-H
-	otf-cjgr-v  Identity-V
-	hgothr-h    JIS-H
-	hgothr-v    JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
-	otf-ujmb-h  Unicode-H
-	otf-ujmb-v  Unicode-V
-	otf-cjmb-h  Identity-H
-	otf-cjmb-v  Identity-V
-	hminb-h     JIS-H
-	hminb-v     JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
-	otf-ujgb-h  Unicode-H
-	otf-ujgb-v  Unicode-V
-	otf-cjgb-h  Identity-H
-	otf-cjgb-v  Identity-V
-	hgothb-h    JIS-H
-	hgothb-v    JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
-	otf-ujmgr-h  Unicode-H
-	otf-ujmgr-v  Unicode-V
-	otf-cjmgr-h  Identity-H
-	otf-cjmgr-v  Identity-V
-	hmgothr-h    JIS-H
-	hmgothr-v    JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf
-	otf-utmr-h  Unicode-H
-	otf-utmr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/MHei-Medium.otf
-	otf-utgr-h  Unicode-H
-	otf-utgr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf
-	otf-ucmr-h  Unicode-H
-	otf-ucmr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/STHeiti-Regular.otf
-	otf-ucgr-h  Unicode-H
-	otf-ucgr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf
-	otf-ukmr-h  Unicode-H
-	otf-ukmr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HYGoThic-Medium-UniKS.otf
-	otf-ukgr-h  Unicode-H
-	otf-ukgr-v  Unicode-V
diff --git a/app-text/ptex/files/ptex-xdvi-vfontmap-kochi-substitute b/app-text/ptex/files/ptex-xdvi-vfontmap-kochi-substitute
deleted file mode 100644
index 5a998c5cef92..000000000000
--- a/app-text/ptex/files/ptex-xdvi-vfontmap-kochi-substitute
+++ /dev/null
@@ -1,126 +0,0 @@
-%
-% Sample "vfontmap"
-%
-
-% [single style]
-% "tfm" "enc" "font"
-
-% [multi style]
-% "/font/file/name"
-%    "tfm1" "enc"
-%    "tfm2" "enc"
-
-% "enc" is one of following.
-% "JIS-H" "Unicode-H" "Identity-H"
-% "JIS-V" "Unicode-V" "Identity-V"
-
-
-%/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
-%/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-%/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf
-/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-	rml  JIS-H
-	rmlv JIS-V
-%/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
-%/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-%/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf
-/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-	gbm  JIS-H
-	gbmv JIS-V
-
-min     JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-nmin    JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-goth    JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-tmin    JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-tgoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-ngoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-jis     JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-jisg    JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-dm      JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-dg      JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-mgoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-fmin    JIS-H /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-fgoth   JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-maru	JIS-H /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-
-% UTF package
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
-	unijmin-h  Unicode-H    % \UTF font
-	unijmin-v  Unicode-V    % \UTF font
-	cidmin-h   Identity-H   % \CID font
-	cidmin-v   Identity-V   % \CID font
-	hmr        JIS-H
-	hmrv       JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
-	unijgoth-h  Unicode-H   % \UTF font
-	unijgoth-v  Unicode-V   % \UTF font
-	cidgoth-h   Identity-H  % \CID font
-	cidgoth-v   Identity-V  % \CID font
-	hkb         JIS-H
-	hkbv        JIS-V
-
-% OTF package
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
-	otf-ujmr-h  Unicode-H
-	otf-ujmr-v  Unicode-V
-	otf-cjmr-h  Identity-H
-	otf-cjmr-v  Identity-V
-	hminr-h     JIS-H
-	hminr-v     JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
-	otf-ujgr-h  Unicode-H
-	otf-ujgr-v  Unicode-V
-	otf-cjgr-h  Identity-H
-	otf-cjgr-v  Identity-V
-	hgothr-h    JIS-H
-	hgothr-v    JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
-	otf-ujmb-h  Unicode-H
-	otf-ujmb-v  Unicode-V
-	otf-cjmb-h  Identity-H
-	otf-cjmb-v  Identity-V
-	hminb-h     JIS-H
-	hminb-v     JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
-	otf-ujgb-h  Unicode-H
-	otf-ujgb-v  Unicode-V
-	otf-cjgb-h  Identity-H
-	otf-cjgb-v  Identity-V
-	hgothb-h    JIS-H
-	hgothb-v    JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
-	otf-ujmgr-h  Unicode-H
-	otf-ujmgr-v  Unicode-V
-	otf-cjmgr-h  Identity-H
-	otf-cjmgr-v  Identity-V
-	hmgothr-h    JIS-H
-	hmgothr-v    JIS-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf
-	otf-utmr-h  Unicode-H
-	otf-utmr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/MHei-Medium.otf
-	otf-utgr-h  Unicode-H
-	otf-utgr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf
-	otf-ucmr-h  Unicode-H
-	otf-ucmr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/STHeiti-Regular.otf
-	otf-ucgr-h  Unicode-H
-	otf-ucgr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf
-	otf-ukmr-h  Unicode-H
-	otf-ukmr-v  Unicode-V
-
-/usr/local/share/texmf/dvipdfm/CIDFont/HYGoThic-Medium-UniKS.otf
-	otf-ukgr-h  Unicode-H
-	otf-ukgr-v  Unicode-V
diff --git a/app-text/ptex/files/xdvi-xorg-7.0.patch b/app-text/ptex/files/xdvi-xorg-7.0.patch
deleted file mode 100644
index 493a39854c29..000000000000
--- a/app-text/ptex/files/xdvi-xorg-7.0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN texk.orig/xdvik/xdvi.h texk/xdvik/xdvi.h
---- texk.orig/xdvik/xdvi.h	2006-10-23 18:12:27.000000000 +0900
-+++ texk/xdvik/xdvi.h	2006-10-23 18:20:51.000000000 +0900
-@@ -236,6 +236,13 @@
- /* only use definitions with prototypes now */
- #define	ARGS(x)	x
- 
-+/* Since xorg-7.0, NeedWidePrototypes in X11/Xfoncproto.h has been
-+ * undefined by default. However, xdvi needs to be built with 
-+ * NeedWidePrototypes to display Japanese. Then we defined it in
-+ * texk/xdvi/xdvi.h
-+ */
-+#define NeedWidePrototypes	1
-+
- #ifndef	NeedWidePrototypes
- #define	NeedWidePrototypes	NeedFunctionPrototypes
- #endif
diff --git a/app-text/ptex/files/xdvizilla.patch b/app-text/ptex/files/xdvizilla.patch
deleted file mode 100644
index bc925280a198..000000000000
--- a/app-text/ptex/files/xdvizilla.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- tetex-bin-2.0.2/texk/xdvik/xdvizilla	2002-10-12 15:28:50.000000000 +0200
-+++ tetex-bin-2.0.2.new/texk/xdvik/xdvizilla	2004-12-23 12:58:35.010332504 +0100
-@@ -33,7 +33,7 @@
- case "$FILETYPE" in
- 
-   *"gzip compressed data"*)
--    FILE=/tmp/xdvizilla$$
-+    FILE=`mktemp -t xdvizilla.XXXXXX` || exit 1
-     gunzip -c "$1" > $FILE
-     [ -n "$NO_RM" ] || rm -f -- "$1"
-     NO_RM=
-@@ -41,7 +41,7 @@
-     ;;
- 
-   *"compressed data"* | *"compress'd data"*)
--    FILE=/tmp/xdvizilla$$
-+    FILE=`mktemp -t xdvizilla.XXXXXX` || exit 1
-     uncompress -c "$1" > $FILE
-     [ -n "$NO_RM" ] || rm -f -- "$1"
-     NO_RM=
-@@ -60,8 +60,7 @@
- case "$FILETYPE" in
- 
-   *" tar archive")
--    TARDIR=/tmp/xdvitar$$
--    mkdir $TARDIR
-+    TARDIR=`mktemp -t -d xdvitar.XXXXXX` || exit 1
-     cat "$FILE" | (cd $TARDIR; tar xf -)
-     DVINAME=`tar tf "$FILE" | grep '\.dvi$' | head -1`
-     [ -n "$NO_RM" ] || rm -f -- "$FILE"
diff --git a/app-text/ptex/files/xpdf-2.02pl1-CAN-2005-3191-3.patch b/app-text/ptex/files/xpdf-2.02pl1-CAN-2005-3191-3.patch
deleted file mode 100644
index 6e2531318df7..000000000000
--- a/app-text/ptex/files/xpdf-2.02pl1-CAN-2005-3191-3.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-Index: xpdf-2.02pl1/xpdf/Stream.h
-===================================================================
---- xpdf-2.02pl1.orig/xpdf/Stream.h
-+++ xpdf-2.02pl1/xpdf/Stream.h
-@@ -225,6 +225,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -242,6 +244,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
-Index: xpdf-2.02pl1/xpdf/Stream.cc
-===================================================================
---- xpdf-2.02pl1.orig/xpdf/Stream.cc
-+++ xpdf-2.02pl1/xpdf/Stream.cc
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <limits.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-@@ -409,13 +410,28 @@ StreamPredictor::StreamPredictor(Stream 
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
- 
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX/nBits ||
-+      width >= INT_MAX/nComps/nBits) {
-+    return;
-+  }
-   nVals = width * nComps;
-+  if (nVals * nBits + 7 <= 0) {
-+    return;
-+  }
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0) {
-+    return;
-+  }
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -981,6 +997,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1226,6 +1246,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+    error(-1, "invalid number of columns");
-+    exit(1);
-+  }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-   black = blackA;
-@@ -2864,6 +2888,11 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2890,6 +2919,11 @@ GBool DCTStream::readProgressiveSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2912,6 +2946,10 @@ GBool DCTStream::readScanInfo() {
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -2979,12 +3017,12 @@ GBool DCTStream::readHuffmanTables() {
-   while (length > 0) {
-     index = str->getChar();
-     --length;
--    if ((index & 0x0f) >= 4) {
-+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
-       error(getPos(), "Bad DCT Huffman table");
-       return gFalse;
-     }
-     if (index & 0x10) {
--      index &= 0x0f;
-+      index &= 0x03;
-       if (index >= numACHuffTables)
- 	numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-@@ -3072,9 +3110,11 @@ int DCTStream::readMarker() {
-   do {
-     do {
-       c = str->getChar();
-+      if(c == EOF) return EOF;
-     } while (c != 0xff);
-     do {
-       c = str->getChar();
-+      if(c == EOF) return EOF;
-     } while (c == 0xff);
-   } while (c == 0x00);
-   return c;
-@@ -3182,6 +3222,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-Index: xpdf-2.02pl1/xpdf/JBIG2Stream.cc
-===================================================================
---- xpdf-2.02pl1.orig/xpdf/JBIG2Stream.cc
-+++ xpdf-2.02pl1/xpdf/JBIG2Stream.cc
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -1001,7 +1002,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
--  data = (Guchar *)gmalloc(h * line);
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    error(-1, "invalid width/height");
-+    data = NULL;
-+    return;
-+  }
-+
-+  // need to allocate one extra guard byte for use in combine()
-+  data = (Guchar *)gmalloc(h * line + 1);
-+  data[h * line] = 0;
- }
- 
- JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
-@@ -1010,8 +1020,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
--  data = (Guchar *)gmalloc(h * line);
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    error(-1, "invalid width/height");
-+    data = NULL;
-+    return;
-+  }
-+
-+  // need to allocate one extra guard byte for use in combine()
-+  data = (Guchar *)gmalloc(h * line + 1);
-   memcpy(data, bitmap->data, h * line);
-+  data[h * line] = 0;
- }
- 
- JBIG2Bitmap::~JBIG2Bitmap() {
-@@ -1036,10 +1055,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1)/ line) {
-+    error(-1, "invalid width/height");
-+    gfree(data);
-+    data = NULL;
-     return;
-   }
--  data = (Guchar *)grealloc(data, newH * line);
-+  // need to allocate one extra guard byte for use in combine()
-+  data = (Guchar *)grealloc(data, newH * line + 1);
-   if (pixel) {
-     memset(data + h * line, 0xff, (newH - h) * line);
-   } else {
-@@ -2576,6 +2599,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (w == 0 || h >= INT_MAX / w) {
-+     error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-+
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -3205,6 +3237,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
-   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
-   int x, y, pix;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
-+    error(-1, "invalid width/height");
-+    return NULL;
-+  }
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
-# vim: syntax=diff
diff --git a/app-text/ptex/files/xpdf-3.00pl2-CAN-2004-1125.patch b/app-text/ptex/files/xpdf-3.00pl2-CAN-2004-1125.patch
deleted file mode 100644
index 119de236d50b..000000000000
--- a/app-text/ptex/files/xpdf-3.00pl2-CAN-2004-1125.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Gfx.cc.orig	Sun Dec 12 16:04:43 2004
---- Gfx.cc	Sun Dec 12 16:05:16 2004
-***************
-*** 2654,2660 ****
-      haveMask = gFalse;
-      dict->lookup("Mask", &maskObj);
-      if (maskObj.isArray()) {
-!       for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-  	maskObj.arrayGet(i, &obj1);
-  	maskColors[i] = obj1.getInt();
-  	obj1.free();
---- 2654,2662 ----
-      haveMask = gFalse;
-      dict->lookup("Mask", &maskObj);
-      if (maskObj.isArray()) {
-!       for (i = 0;
-! 	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-! 	   ++i) {
-  	maskObj.arrayGet(i, &obj1);
-  	maskColors[i] = obj1.getInt();
-  	obj1.free();
-*** GfxState.cc.orig	Sun Dec 12 16:04:48 2004
---- GfxState.cc	Sun Dec 12 16:06:38 2004
-***************
-*** 708,713 ****
---- 708,718 ----
-    }
-    nCompsA = obj2.getInt();
-    obj2.free();
-+   if (nCompsA > gfxColorMaxComps) {
-+     error(-1, "ICCBased color space with too many (%d > %d) components",
-+ 	  nCompsA, gfxColorMaxComps);
-+     nCompsA = gfxColorMaxComps;
-+   }
-    if (dict->lookup("Alternate", &obj2)->isNull() ||
-        !(altA = GfxColorSpace::parse(&obj2))) {
-      switch (nCompsA) {
diff --git a/app-text/ptex/files/xpdf-3.00pl3-CAN-2005-0064.patch b/app-text/ptex/files/xpdf-3.00pl3-CAN-2005-0064.patch
deleted file mode 100644
index d7d2294c8527..000000000000
--- a/app-text/ptex/files/xpdf-3.00pl3-CAN-2005-0064.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-*** XRef.cc.orig	Wed Jan 12 17:10:53 2005
---- XRef.cc	Wed Jan 12 17:11:22 2005
-***************
-*** 793,798 ****
---- 793,801 ----
-  	} else {
-  	  keyLength = 5;
-  	}
-+ 	if (keyLength > 16) {
-+ 	  keyLength = 16;
-+ 	}
-  	permFlags = permissions.getInt();
-  	if (encVersion >= 1 && encVersion <= 2 &&
-  	    encRevision >= 2 && encRevision <= 3) {
diff --git a/app-text/ptex/files/xpdf-CESA-2004-007-xpdf2-newer.diff b/app-text/ptex/files/xpdf-CESA-2004-007-xpdf2-newer.diff
deleted file mode 100644
index 55a24458c9a4..000000000000
--- a/app-text/ptex/files/xpdf-CESA-2004-007-xpdf2-newer.diff
+++ /dev/null
@@ -1,78 +0,0 @@
---- XRef.cc.orig	2004-09-17 23:54:38.000000000 -0700
-+++ XRef.cc	2004-09-25 17:59:36.000000000 -0700
-@@ -76,6 +76,12 @@
- 
-   // trailer is ok - read the xref table
-   } else {
-+    if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+      error(-1, "Invalid 'size' inside xref table.");
-+      ok = gFalse;
-+      errCode = errDamaged;
-+      return;
-+    }
-     entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry));
-     for (i = 0; i < size; ++i) {
-       entries[i].offset = 0xffffffff;
-@@ -267,6 +273,10 @@
-     // table size
-     if (first + n > size) {
-       newSize = size + 256;
-+      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+        error(-1, "Invalid 'newSize'");
-+        goto err2;
-+      }
-       entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
-       for (i = size; i < newSize; ++i) {
- 	entries[i].offset = 0xffffffff;
-@@ -410,6 +420,10 @@
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
-+	        if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+	          error(-1, "Invalid 'obj' parameters.");
-+	          return gFalse;
-+	        }
- 		entries = (XRefEntry *)
- 		            grealloc(entries, newSize * sizeof(XRefEntry));
- 		for (i = size; i < newSize; ++i) {
-@@ -431,6 +445,11 @@
-     } else if (!strncmp(p, "endstream", 9)) {
-       if (streamEndsLen == streamEndsSize) {
- 	streamEndsSize += 64;
-+        if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
-+          error(-1, "Invalid 'endstream' parameter.");
-+          return gFalse;
-+        }
-+
- 	streamEnds = (Guint *)grealloc(streamEnds,
- 				       streamEndsSize * sizeof(int));
-       }
---- Catalog.cc.orig	2004-10-18 16:26:39.388666476 +0200
-+++ Catalog.cc	2004-10-18 16:27:28.004749073 +0200
-@@ -62,6 +62,12 @@
-   }
-   pagesSize = numPages0 = obj.getInt();
-   obj.free();
-+  if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+      pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+    error(-1, "Invalid 'pagesSize'");
-+    ok = gFalse;
-+    return;
-+  }
-   pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
-   pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
-   for (i = 0; i < pagesSize; ++i) {
-@@ -186,6 +192,11 @@
-       }
-       if (start >= pagesSize) {
- 	pagesSize += 32;
-+        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+            pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+          error(-1, "Invalid 'pagesSize' parameter.");
-+          goto err3;
-+        }
- 	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
- 	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
- 	for (j = pagesSize - 32; j < pagesSize; ++j) {
-
-
diff --git a/app-text/ptex/files/xpdf-goo-sizet.patch b/app-text/ptex/files/xpdf-goo-sizet.patch
deleted file mode 100644
index 5d90c5120bd4..000000000000
--- a/app-text/ptex/files/xpdf-goo-sizet.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru xpdf-2.02pl1/goo/gmem.c xpdf-2.02pl1/goo/gmem.c
---- xpdf-2.02pl1/goo/gmem.c	2003-06-16 22:01:26.000000000 +0200
-+++ xpdf-2.02pl1/goo/gmem.c	2004-10-29 15:13:34.866919791 +0200
-@@ -53,9 +53,9 @@
- 
- #endif /* DEBUG_MEM */
- 
--void *gmalloc(int size) {
-+void *gmalloc(size_t size) {
- #ifdef DEBUG_MEM
--  int size1;
-+  size_t size1;
-   char *mem;
-   GMemHdr *hdr;
-   void *data;
-@@ -94,11 +94,11 @@
- #endif
- }
- 
--void *grealloc(void *p, int size) {
-+void *grealloc(void *p, size_t size) {
- #ifdef DEBUG_MEM
-   GMemHdr *hdr;
-   void *q;
--  int oldSize;
-+  size_t oldSize;
- 
-   if (size == 0) {
-     if (p)
-@@ -137,7 +137,7 @@
- 
- void gfree(void *p) {
- #ifdef DEBUG_MEM
--  int size;
-+  size_t size;
-   GMemHdr *hdr;
-   GMemHdr *prevHdr, *q;
-   int lst;
-diff -ru xpdf-2.02pl1/goo/gmem.h xpdf-2.02pl1/goo/gmem.h
---- xpdf-2.02pl1/goo/gmem.h	2003-06-16 22:01:26.000000000 +0200
-+++ xpdf-2.02pl1/goo/gmem.h	2004-10-29 15:13:50.864027201 +0200
-@@ -19,13 +19,13 @@
-  * Same as malloc, but prints error message and exits if malloc()
-  * returns NULL.
-  */
--extern void *gmalloc(int size);
-+extern void *gmalloc(size_t size);
- 
- /*
-  * Same as realloc, but prints error message and exits if realloc()
-  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
-  */
--extern void *grealloc(void *p, int size);
-+extern void *grealloc(void *p, size_t size);
- 
- /*
-  * Same as free, but checks for and ignores NULL pointers.
diff --git a/app-text/ptex/files/xpdf2-underflow.patch b/app-text/ptex/files/xpdf2-underflow.patch
deleted file mode 100644
index 9371be84352e..000000000000
--- a/app-text/ptex/files/xpdf2-underflow.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ru xpdf-2.02pl1/xpdf/XRef.cc xpdf-2.02pl1/xpdf/XRef.cc
---- xpdf-2.02pl1/xpdf/XRef.cc	2004-10-29 15:16:45.790089001 +0200
-+++ xpdf-2.02pl1/xpdf/XRef.cc	2004-10-29 15:11:54.132168025 +0200
-@@ -66,6 +66,8 @@
-   start = str->getStart();
-   pos = readTrailer();
- 
-+  entries = NULL;
-+
-   // if there was a problem with the trailer,
-   // try to reconstruct the xref table
-   if (pos == 0) {
-@@ -76,7 +78,7 @@
- 
-   // trailer is ok - read the xref table
-   } else {
--    if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+    if ((size < 0) || (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size)) {
-       error(-1, "Invalid 'size' inside xref table.");
-       ok = gFalse;
-       errCode = errDamaged;
-@@ -181,7 +183,7 @@
-     n = atoi(p);
-     while ('0' <= *p && *p <= '9') ++p;
-     while (isspace(*p)) ++p;
--    if (p == buf)
-+    if ((p == buf) || (n < 0)) /* must make progress */
-       return 0;
-     pos1 += (p - buf) + n * 20;
-   }
-@@ -255,6 +257,10 @@
-     }
-     s[i] = '\0';
-     first = atoi(s);
-+    if (first < 0) {
-+        error(-1, "Invalid 'first'");
-+        goto err2;
-+    }
-     while ((c = str->lookChar()) != EOF && isspace(c)) {
-       str->getChar();
-     }
-@@ -266,6 +272,10 @@
-     }
-     s[i] = '\0';
-     n = atoi(s);
-+    if (n<=0) {
-+        error(-1, "Invalid 'n'");
-+        goto err2;
-+    }
-     while ((c = str->lookChar()) != EOF && isspace(c)) {
-       str->getChar();
-     }
-@@ -273,7 +283,7 @@
-     // table size
-     if (first + n > size) {
-       newSize = size + 256;
--      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+      if ((newSize < 0) || (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize)) {
-         error(-1, "Invalid 'newSize'");
-         goto err2;
-       }
-@@ -406,6 +416,10 @@
-     // look for object
-     } else if (isdigit(*p)) {
-       num = atoi(p);
-+      if (num < 0) {
-+	error(-1, "Invalid 'num' parameters.");
-+	return gFalse;
-+      }
-       do {
- 	++p;
-       } while (*p && isdigit(*p));
-@@ -425,7 +439,7 @@
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
--	        if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+	        if ((newSize < 0) || (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize)) {
- 	          error(-1, "Invalid 'obj' parameters.");
- 	          return gFalse;
- 	        }
diff --git a/app-text/ptex/ptex-3.1.10_p20071214.ebuild b/app-text/ptex/ptex-3.1.10_p20071214.ebuild
deleted file mode 100644
index 8bdc2277a6f0..000000000000
--- a/app-text/ptex/ptex-3.1.10_p20071214.ebuild
+++ /dev/null
@@ -1,278 +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_p20071214.ebuild,v 1.2 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"
-
-DEPEND="!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
-		)
-	)"
-
-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}"/${PN}-3.1.10_p20071203-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
-}
-
-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_p20080107.ebuild b/app-text/ptex/ptex-3.1.10_p20080107.ebuild
deleted file mode 100644
index bb08e50e4c01..000000000000
--- a/app-text/ptex/ptex-3.1.10_p20080107.ebuild
+++ /dev/null
@@ -1,282 +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_p20080107.ebuild,v 1.2 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}"/${PN}-3.1.10_p20071203-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
deleted file mode 100644
index 189f705d3314..000000000000
--- a/app-text/ptex/ptex-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,137 +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.5-r1.ebuild,v 1.14 2008/02/14 16:05:47 matsuu Exp $
-
-PTEX_TEXMF_PV=2.3
-TETEX_PV=2.0.2
-
-inherit tetex-2
-
-DESCRIPTION="The ASCII publishing TeX distribution"
-HOMEPAGE="http://www.ascii.co.jp/pb/ptex/"
-
-PTEX_SRC="ptex-src-${PV}.tar.gz"
-PTEX_TEXMF="ptex-texmf-${PTEX_TEXMF_PV}.tar.gz"
-
-SRC_PATH_PTEX="ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex"
-SRC_URI="${SRC_URI}
-	${SRC_PATH_PTEX}/tetex/${PTEX_SRC}
-	${SRC_PATH_PTEX}/tetex/${PTEX_TEXMF}
-	${SRC_PATH_PTEX}/dvips/dvipsk-jpatch-p1.6a.tar.gz
-	X? ( http://tutimura.ath.cx/~nob/tex/xdvi/tetex-src-2.0.2-xdvik-y1.patch.gz
-		http://tutimura.ath.cx/~nob/tex/xdvi/tetex-src-2.0.2-xdvik-y1-j1.19.patch.gz
-		http://www.nn.iij4u.or.jp/~tutimura/tex/xdvik-22.40y1-j1.21.patch.gz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="X"
-
-DEPEND="X? ( >=media-libs/freetype-2
-	>=media-fonts/kochi-substitute-20030809-r3 )
-	!app-text/xdvik
-	!app-tex/tetex"
-
-src_unpack() {
-	tetex-2_src_unpack
-
-	einfo "Unpacking pTeX sources..."
-	cd "${S}"/texmf
-	unpack ${PTEX_TEXMF}
-
-	cd "${S}"/texk/web2c
-	unpack ${PTEX_SRC}
-
-	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
-		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
-		cd texk/oxdvik
-		ln -s ../xdvik/*.{c,h} ./
-		cp -f ../xdvik/Makefile.in.oxdvi Makefile.in
-		cp -f ../xdvik/c-auto.in ./
-	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
-
-	#bug 115775
-	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
-
-	# bug 118264
-	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch "${FILESDIR}"/${P}-dvi-draw-conflicting-types.patch
-
-}
-
-src_compile() {
-	if use X ; then
-		export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		TETEX_ECONF="--with-vflib=vf2ft"
-	fi
-
-	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
-
-	cd "${S}"/texk/web2c/${PN}-src-${PV} || die
-	./configure EUC || die "configure pTeX failed"
-
-	make programs || die "make pTeX failed"
-}
-
-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
-
-	insinto /usr/share/texmf/dvips/config
-	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
-	dodoc ../ChangeLog.jpatch ../README.jpatch
-
-	if use X ; then
-		cd "${S}"/texk/xdvik
-		docinto xdvik
-		dodoc ANNOUNCE BUGS CHANGES.xdvik-jp FAQ README.*
-		docinto xdvik/READMEs
-		dodoc READMEs/*
-	fi
-}