remove texlive 2005 as 2007 has been there for a while

(Portage version: 2.1.4_rc10)

12 files changed, 13 insertions, 684 deletions

diff --git a/app-text/texlive/ChangeLog b/app-text/texlive/ChangeLog
index 3bc218f6b459..52f91975434e 100644
--- a/app-text/texlive/ChangeLog
+++ b/app-text/texlive/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-text/texlive
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/ChangeLog,v 1.26 2007/12/11 10:44:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/ChangeLog,v 1.27 2007/12/15 10:37:20 aballier Exp $
+
+  15 Dec 2007; Alexis Ballier <aballier@gentoo.org>
+  -files/2005/texlive-2005-amd64-xdvik-wp.patch,
+  -files/2005/texlive-2005-create-empty-files.patch,
+  -files/2005/texlive-2005-fmtutil-in.patch,
+  -files/2005/texlive-2005-gentoo-texmf-site.patch,
+  -files/2005/texlive-2005-mptest.patch,
+  -files/2005/texlive-2005-pdftosrc-install.patch,
+  -files/2005/texlive-2005-use-system-libtool.patch,
+  -files/2005/texlive-2005-xpdf-vulnerabilities.patch, -files/texmf-update,
+  -texlive-2005.ebuild:
+  remove texlive 2005 as 2007 has been there for a while
 
   11 Dec 2007; Alexis Ballier <aballier@gentoo.org> texlive-2005.ebuild:
   remove cstetex references, its being removed, part of bug #196673
diff --git a/app-text/texlive/files/2005/texlive-2005-amd64-xdvik-wp.patch b/app-text/texlive/files/2005/texlive-2005-amd64-xdvik-wp.patch
deleted file mode 100644
index 7358b1803ab1..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-amd64-xdvik-wp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN TeX.orig/texk/xdvik/x_util.c TeX/texk/xdvik/x_util.c
---- TeX.orig/texk/xdvik/x_util.c	2004-12-03 00:40:41.000000000 +0100
-+++ TeX/texk/xdvik/x_util.c	2006-05-27 23:09:34.000000000 +0200
-@@ -205,15 +205,15 @@
-     w = (*((xuint32 *) window_p));
- #else
- # if WORDS_BIGENDIAN
--    w = ((unsigned long)wp[0] << 24) |
--	((unsigned long)wp[1] << 16) |
--	((unsigned long)wp[2] << 8)  |
--	(unsigned long)wp[3];
-+    w = ((unsigned long)window_p[0] << 24) |
-+	((unsigned long)window_p[1] << 16) |
-+	((unsigned long)window_p[2] << 8)  |
-+	(unsigned long)window_p[3];
- # else
--    w = ((unsigned long)wp[3] << 24) |
--	((unsigned long)wp[2] << 16) |
--	((unsigned long)wp[1] << 8)  |
--	(unsigned long)wp[0];
-+    w = ((unsigned long)window_p[3] << 24) |
-+	((unsigned long)window_p[2] << 16) |
-+	((unsigned long)window_p[1] << 8)  |
-+	(unsigned long)window_p[0];
- # endif
- #endif
-     return w;
diff --git a/app-text/texlive/files/2005/texlive-2005-create-empty-files.patch b/app-text/texlive/files/2005/texlive-2005-create-empty-files.patch
deleted file mode 100644
index e021a2dfc12e..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-create-empty-files.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN TeX.orig/texk/kpathsea/mktexlsr TeX/texk/kpathsea/mktexlsr
---- TeX.orig/texk/kpathsea/mktexlsr	2005-06-21 16:32:26.000000000 +0200
-+++ TeX/texk/kpathsea/mktexlsr	2006-05-27 23:46:52.000000000 +0200
-@@ -108,7 +108,7 @@
-   test -w "$db_dir" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; }
- 
-   if test ! -f "$db_file"; then
--    cp /dev/null "$db_file"
-+    touch "$db_file"
-     # Use same permissions as parent directory, minus x,s, or t bits.
-     chmod `kpsestat -xst "$db_dir"` "$db_file"
-   elif test -s "$db_file" \
-diff -urN TeX.orig/texk/make/man.mk TeX/texk/make/man.mk
---- TeX.orig/texk/make/man.mk	2002-11-12 21:54:15.000000000 +0100
-+++ TeX/texk/make/man.mk	2006-05-27 23:46:52.000000000 +0200
-@@ -28,7 +28,7 @@
- # Makefile can change for reasons that do not affect the man pages.
- # At present, all but VERSION should be unused.
- sedscript:
--	cp /dev/null sedscript
-+	touch sedscript
- 	for f in $(kpathsea_dir)/paths.h; do \
- 	  sed -n -e '/^#define/s/#define[ 	][ 	]*\([A-Z_a-z][A-Z_a-z]*\)[ 	][ 	]*\(.*\)/s%@\1@%\2%/p' \
- 		$$f \
diff --git a/app-text/texlive/files/2005/texlive-2005-fmtutil-in.patch b/app-text/texlive/files/2005/texlive-2005-fmtutil-in.patch
deleted file mode 100644
index 578ac34290a1..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-fmtutil-in.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN TeX.orig/texk/web2c/fmtutil.in TeX/texk/web2c/fmtutil.in
---- TeX.orig/texk/web2c/fmtutil.in	2005-09-12 18:09:28.000000000 +0200
-+++ TeX/texk/web2c/fmtutil.in	2006-05-27 23:39:05.000000000 +0200
-@@ -45,9 +45,10 @@
- # if you want babel support in tex. Add -translate-file=cp227.tcx before tex.ini
- # if you want to make all characters directly "printable" for
- # any \write (instead of ^^xy).
--tex		tex		-		tex.ini
-+tex		tex		language.dat	tex.ini
- latex		pdfetex		language.dat	-translate-file=cp227.tcx *latex.ini
- etex		pdfetex		language.def	-translate-file=cp227.tcx *etex.ini
-+elatex		pdfetex		language.def	-translate-file=cp227.tcx *latex.ini
- pdftex		pdfetex		-	-translate-file=cp227.tcx *pdftex.ini
- pdflatex	pdfetex		language.dat	-translate-file=cp227.tcx *pdflatex.ini
- pdfetex		pdfetex		language.def	-translate-file=cp227.tcx *pdfetex.ini
-@@ -60,11 +61,11 @@
- 
- # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
- # if you want babel support in amstex:
--amstex	pdfetex		-		-translate-file=cp227.tcx *amstex.ini
-+amstex	pdfetex		language.dat	-translate-file=cp227.tcx *amstex.ini
- 
- # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
- # if you want babel support in pdfamstex:
--#! pdfamstex	pdfetex			-	-translate-file=cp227.tcx *pdfamstex.ini
-+pdfamstex	pdfetex			language.dat	-translate-file=cp227.tcx *pdfamstex.ini
- 
- # Context formats:
- #! cont-cz	pdfetex		cont-usr.tex	-8bit *cont-cz.ini
-@@ -116,7 +117,7 @@
- 
- # Change "eplain.ini -> ebplain.ini" and "- -> language.dat"
- # if you want babel support in eplain:
--eplain	pdfetex		-		-translate-file=cp227.tcx *eplain.ini
-+eplain	pdfetex		language.dat		-translate-file=cp227.tcx *eplain.ini
- 
- # mptopdf utility
- mptopdf		pdfetex	-		-translate-file=cp227.tcx mptopdf.tex
diff --git a/app-text/texlive/files/2005/texlive-2005-gentoo-texmf-site.patch b/app-text/texlive/files/2005/texlive-2005-gentoo-texmf-site.patch
deleted file mode 100644
index 3ed13325ecb6..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-gentoo-texmf-site.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN TeX.orig/texk/kpathsea/texmf.in TeX/texk/kpathsea/texmf.in
---- TeX.orig/texk/kpathsea/texmf.in	2005-08-31 21:42:48.000000000 +0200
-+++ TeX/texk/kpathsea/texmf.in	2006-05-27 23:56:46.000000000 +0200
-@@ -61,6 +61,9 @@
- % The main distribution tree:
- TEXMFDIST = @texmf@-dist
- 
-+% The Gentoo site tree:
-+TEXMFSITE = /usr/share/texmf-site
-+
- % A place for local additions to a "standard" texmf tree.
- % This tree is not used for local configuration maintained by
- % texconfig, it uses TEXMFCONFIG below.
-@@ -111,10 +114,10 @@
- %
- % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
- % explicitly and before all other trees.
--TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-+TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST}
- 
- % The system trees.  These are the trees that are shared by all the users.
--SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
-+SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST;$TEXMFSITE
- 
- % Where generated fonts may be written.  This tree is used when the sources
- % were found in a system tree and either that tree wasn't writable, or the
diff --git a/app-text/texlive/files/2005/texlive-2005-mptest.patch b/app-text/texlive/files/2005/texlive-2005-mptest.patch
deleted file mode 100644
index f99c8a5bba94..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-mptest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN TeX.orig/texk/web2c/tests/mptest.mp TeX/texk/web2c/tests/mptest.mp
---- TeX.orig/texk/web2c/tests/mptest.mp	2000-06-21 00:27:56.000000000 +0200
-+++ TeX/texk/web2c/tests/mptest.mp	2006-05-27 23:12:52.000000000 +0200
-@@ -40,6 +40,6 @@
- 
- message("* Test for big numbers in btex...etex:");
- picture q;
--q = btex $2^{12} = 4096 \qquad 2^{15} = 32768$ etex;
-+%q = btex $2^{12} = 4096 \qquad 2^{15} = 32768$ etex;
- 
- end.
diff --git a/app-text/texlive/files/2005/texlive-2005-pdftosrc-install.patch b/app-text/texlive/files/2005/texlive-2005-pdftosrc-install.patch
deleted file mode 100644
index 960bba6d6908..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-pdftosrc-install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN TeX.orig/texk/web2c/Makefile.in TeX/texk/web2c/Makefile.in
---- TeX.orig/texk/web2c/Makefile.in	2005-08-03 11:08:02.000000000 +0200
-+++ TeX/texk/web2c/Makefile.in	2006-05-27 23:45:48.000000000 +0200
-@@ -562,13 +562,13 @@
- # Common
- programs = bibtex ctangle ctie cweave dvicopy dvitomp dvitype gftodvi gftopk \
-  gftype mft $(odvicopy) $(odvitype) $(otangle) patgen pktogf pktype pltotf \
-- pooltype tangle tftopl tie $(ttf2afm) vftovp vptovf weave
-+ pooltype tangle tftopl tie $(ttf2afm) vftovp vptovf weave pdftosrc
- engines = $(tex) $(etex) $(mf) $(mfn) $(mpost) \
-           $(omega) $(aleph) \
-           $(pdftex) $(pdfetex)
- 
- programs: $(programs) $(engines) $(mpware_programs) \
--          $(omegafonts_programs) $(otps_programs) $(pdftosrc)
-+          $(omegafonts_programs) $(otps_programs)
- 
- # Additional dependencies for relinking.
- # Note that each program and engine already depends on $(web2c_programs).
diff --git a/app-text/texlive/files/2005/texlive-2005-use-system-libtool.patch b/app-text/texlive/files/2005/texlive-2005-use-system-libtool.patch
deleted file mode 100644
index 3b8df13efd41..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-use-system-libtool.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -urN TeX.orig/texk/kpathsea/configure TeX/texk/kpathsea/configure
---- TeX.orig/texk/kpathsea/configure	2005-08-21 22:04:18.000000000 +0200
-+++ TeX/texk/kpathsea/configure	2006-05-27 20:01:29.000000000 +0200
-@@ -5539,7 +5539,11 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+if [ "${USERLAND}" = "Darwin" ]; then
-+LIBTOOL='glibtool'
-+else
-+LIBTOOL='libtool'
-+fi
- 
- # Prevent multiple expansion
- 
-diff -urN TeX.orig/texk/libtool.m4 TeX/texk/libtool.m4
---- TeX.orig/texk/libtool.m4	2005-08-14 16:13:04.000000000 +0200
-+++ TeX/texk/libtool.m4	2006-05-27 20:02:13.000000000 +0200
-@@ -31,7 +31,13 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+# Use the system libtool
-+if [ "${USERLAND}" = "Darwin" ]; then
-+LIBTOOL='glibtool'
-+else
-+LIBTOOL='libtool'
-+fi
-+
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
-diff -urN TeX.orig/texk/make/common.mk TeX/texk/make/common.mk
---- TeX.orig/texk/make/common.mk	2004-08-06 20:40:50.000000000 +0200
-+++ TeX/texk/make/common.mk	2006-05-27 20:03:18.000000000 +0200
-@@ -12,7 +12,11 @@
- LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
- 
- # Kpathsea needs this for compiling, programs need it for linking.
--LIBTOOL = $(SHELL) $(kpathsea_parent)/libtool
-+ifeq ($(USERLAND),Darwin)
-+LIBTOOL='glibtool'
-+else
-+LIBTOOL='libtool'
-+endif
- 
- # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
- # please don't change ALL_CPPFLAGS or ALL_CFLAGS.
diff --git a/app-text/texlive/files/2005/texlive-2005-xpdf-vulnerabilities.patch b/app-text/texlive/files/2005/texlive-2005-xpdf-vulnerabilities.patch
deleted file mode 100644
index 7ad201d4e2d2..000000000000
--- a/app-text/texlive/files/2005/texlive-2005-xpdf-vulnerabilities.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -urN TeX.orig/libs/xpdf/xpdf/JBIG2Stream.cc TeX/libs/xpdf/xpdf/JBIG2Stream.cc
---- TeX.orig/libs/xpdf/xpdf/JBIG2Stream.cc	2005-08-17 07:34:31.000000000 +0200
-+++ TeX/libs/xpdf/xpdf/JBIG2Stream.cc	2006-05-28 23:52:10.000000000 +0200
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -681,6 +682,11 @@
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
-+  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;
-@@ -692,6 +698,11 @@
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->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);
-@@ -720,7 +731,10 @@
- }
- 
- 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;
-   }
-   // need to allocate one extra guard byte for use in combine()
-@@ -2936,6 +2950,11 @@
-   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();
- 
-diff -urN TeX.orig/libs/xpdf/xpdf/JPXStream.cc TeX/libs/xpdf/xpdf/JPXStream.cc
---- TeX.orig/libs/xpdf/xpdf/JPXStream.cc	2005-08-17 07:34:31.000000000 +0200
-+++ TeX/libs/xpdf/xpdf/JPXStream.cc	2006-05-28 23:44:00.000000000 +0200
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-diff -urN TeX.orig/libs/xpdf/xpdf/Stream.cc TeX/libs/xpdf/xpdf/Stream.cc
---- TeX.orig/libs/xpdf/xpdf/Stream.cc	2005-08-17 07:34:31.000000000 +0200
-+++ TeX/libs/xpdf/xpdf/Stream.cc	2006-05-28 23:49:26.000000000 +0200
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -1256,8 +1257,9 @@
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
--  if (columns < 1) {
--    columns = 1;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+    error (-1, "invalid number of columns: %d\n", columns);
-+    exit (1);
-   }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-@@ -2925,6 +2927,10 @@
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2947,6 +2953,11 @@
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    scanInfo.numComps = 0;
-+    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");
-@@ -3031,12 +3042,12 @@
-   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];
-@@ -3154,9 +3165,11 @@
-   do {
-     do {
-       c = str->getChar();
-+      if (c == EOF) return EOF;
-     } while (c != 0xff && c != EOF);
-     do {
-       c = str->getChar();
-+      if (c == EOF) return EOF;
-     } while (c == 0xff);
-   } while (c == 0x00);
-   return c;
diff --git a/app-text/texlive/files/digest-texlive-2005 b/app-text/texlive/files/digest-texlive-2005
deleted file mode 100644
index 2a36d2d94a01..000000000000
--- a/app-text/texlive/files/digest-texlive-2005
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 841d6678183bda7089526e5b7d2eba69 texlive-2005-src.tar.bz2 18754502
-RMD160 ac2c390cad8160028b2754c46a347847d6523346 texlive-2005-src.tar.bz2 18754502
-SHA256 faf645ca74889c35ec9df5902e8b0d7afe1eb29477574a6747810b671afef674 texlive-2005-src.tar.bz2 18754502
-MD5 527ae2d21701b787764d6cfe52ee51f3 texlive-2005-texmf-dist.tar.bz2 408486129
-RMD160 32d046f1363028bf8164bd1525a60968ca78ec39 texlive-2005-texmf-dist.tar.bz2 408486129
-SHA256 ef6838f569cdbcc7ce49b1102be7797995c1b0e82e0c9b593acf0c5b133b843c texlive-2005-texmf-dist.tar.bz2 408486129
-MD5 7abffdae0ea9cdd4823efcbc02e96b91 texlive-2005-texmf.tar.bz2 16285465
-RMD160 bcdad713732a49607005130b8f707f7fbeb59815 texlive-2005-texmf.tar.bz2 16285465
-SHA256 ffe9d2ec59a30aa4972ae21a99e8e0ea85648204a77f9e114b01bd3a8a603a6b texlive-2005-texmf.tar.bz2 16285465
diff --git a/app-text/texlive/files/texmf-update b/app-text/texlive/files/texmf-update
deleted file mode 100644
index 99f7bb46a397..000000000000
--- a/app-text/texlive/files/texmf-update
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-#
-# Utility to update Gentoo teTeX distribution configuration files
-#
-
-PATH=/bin:/usr/bin
-
-# Fix for all those with altered umask for root
-umask 022
-
-# Make sure we have a correct environment, bug #30432
-# The list of env. vars is taken from the INSTALL file
-for texvar in AFMFONTS BIBINPUTS BSTINPUTS DVILJFONTS DVIPSFONTS \
-	DVIPSHEADERS GFFONTS GLYPHFONTS INDEXSTYLE MFBASES MFINPUTS \
-	MFPOOL MFTINPUTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS \
-	OFMFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PKFONTS PSHEADERS \
-	T1FONTS T1INPUTS TEXBIB TEXCONFIG TEXDOCS TEXFONTMAPS TEXFONTS \
-	TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF TEXMFDBS TEXMFINI \
-	TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS \
-	VFFONTS XDVIFONTS XDVIVFS ; do
-
-	if [ "${!texvar}" ]; then
-		if ! $(echo ${!texvar} | grep '^:\|::\|:$' &>/dev/null) ; then
-			export ${texvar}="${!texvar}:"
-		fi
-	fi
-done
-
-if [ "$TEXINPUTS" ]; then
-	if $(echo ${TEXINPUTS} | grep '/usr/share/texmf' &>/dev/null) ; then
-		export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/usr/share/texmf/*:\?||g')
-	elif $(echo ${TEXINPUTS} | grep '/var/lib/texmf' &>/dev/null) ; then
-		export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/var/lib/texmf/*:\?||g')
-	fi
-fi
-
-for conf in texmf.cnf fmtutil.cnf updmap.cfg ; do
-	if [ -d "/etc/texmf/${conf/.*/.d}" ] ; then
-		echo "Generating /etc/texmf/web2c/${conf} from /etc/texmf/${conf/.*/.d} ..."
-		cat /etc/texmf/${conf/.*/.d}/* > "/etc/texmf/web2c/${conf}"
-	fi
-done
-
-# configure
-echo "Configuring teTeX ..."
-mktexlsr &>/dev/null
-texconfig-sys init &>/dev/null
-texconfig-sys confall &>/dev/null
-texconfig-sys font rw &>/dev/null
-texconfig-sys font vardir /var/cache/fonts &>/dev/null
-updmap-sys &>/dev/null
-
-# generate
-echo "Generating format files ..."
-fmtutil-sys --missing &>/dev/null
-echo
-echo "Use 'texconfig font ro' to disable font generation for users"
-echo
diff --git a/app-text/texlive/texlive-2005.ebuild b/app-text/texlive/texlive-2005.ebuild
deleted file mode 100644
index 0ae4b8af4d42..000000000000
--- a/app-text/texlive/texlive-2005.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2005.ebuild,v 1.6 2007/12/11 10:44:15 aballier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs versionator virtualx
-
-TEXMF_PATH=/var/lib/texmf
-
-DESCRIPTION="a complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2"
-
-SRC_URI="http://dev.gentoo.org/~ehmsen/texlive/${P}-src.tar.bz2
-	http://dev.gentoo.org/~ehmsen/texlive/${P}-texmf-dist.tar.bz2
-	http://dev.gentoo.org/~ehmsen/texlive/${P}-texmf.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc tk Xaw3d lesstif motif neXt"
-
-# This is less than an ideal name
-PROVIDE="virtual/tetex"
-
-# I hope to kick this very soon
-BLOCKS="!dev-tex/memoir
-	!dev-tex/lineno
-	!dev-tex/SIunits
-	!dev-tex/floatflt
-	!dev-tex/g-brief
-	!dev-tex/pgf
-	!dev-tex/xcolor
-	!dev-tex/xkeyval
-	!dev-tex/latex-beamer
-	!dev-tex/vntex
-	!dev-tex/koma-script
-	!dev-tex/currvita
-	!dev-tex/eurosym
-	!dev-tex/extsizes"
-
-MODULAR_X_DEPEND="X? ( x11-libs/libXmu
-			x11-libs/libXp
-			x11-libs/libXpm
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXaw
-			x11-libs/libXfont )"
-
-DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	X? ( motif? ( lesstif? ( x11-libs/lesstif )
-			!lesstif? ( x11-libs/openmotif ) )
-		!motif? ( neXt? ( x11-libs/neXtaw )
-			!neXt? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-		!app-text/xdvik
-	)
-	sys-apps/ed
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.1
-	sys-libs/ncurses
-	>=net-libs/libwww-5.3.2-r1"
-
-RDEPEND="${DEPEND}
-	${BLOCKS}
-	>=dev-lang/perl-5.2
-	tk? ( dev-perl/perl-tk )
-	dev-util/dialog"
-
-src_unpack() {
-	unpack ${P}-src.tar.bz2 || die "unpack src"
-
-	cd "${S}"
-
-	unpack ${P}-texmf.tar.bz2 || die "unpack texmf"
-	unpack ${P}-texmf-dist.tar.bz2 || die "unpack texmf-dist"
-
-	epatch "${FILESDIR}/${PV}/${P}-use-system-libtool.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-amd64-xdvik-wp.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-mptest.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-fmtutil-in.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-xpdf-vulnerabilities.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-pdftosrc-install.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-create-empty-files.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-gentoo-texmf-site.patch" || die
-
-	sed -i -e "/mktexlsr/,+3d" -e "s/\(updmap-sys\)/\1 --nohash/" \
-		Makefile.in || die "sed"
-}
-
-src_compile() {
-	local my_conf
-
-	export LC_ALL=C
-
-	filter-flags "-fstack-protector" "-Os"
-	use amd64 && replace-flags "-O3" "-O2"
-
-	if use X ; then
-		addwrite /var/cache/fonts
-		my_conf="${my_conf} --with-xdvik --with-oxdvik"
-		if use motif ; then
-			if use lesstif ; then
-				append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-				export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
-			fi
-			my_conf="${my_conf} --with-xdvi-x-toolkit=motif"
-		elif use neXt ; then
-			my_conf="${my_conf} --with-xdvi-x-toolkit=neXtaw"
-		elif use Xaw3d ; then
-			my_conf="${my_conf} --with-xdvi-x-toolkit=xaw3d"
-		else
-			my_conf="${my_conf} --with-xdvi-x-toolkit=xaw"
-		fi
-	else
-		my_conf="${my_conf} --without-xdvik --without-oxdvik"
-	fi
-
-	econf --bindir=/usr/bin \
-		--datadir=${S} \
-		--with-system-wwwlib \
-		--with-libwww-include=/usr/include/w3c-libwww \
-		--with-system-ncurses \
-		--with-system-pnglib \
-		--without-texinfo \
-		--without-dialog \
-		--without-texi2html \
-		--with-system-zlib \
-		--disable-multiplatform \
-		--with-epsfwin \
-		--with-mftalkwin \
-		--with-regiswin \
-		--with-tektronixwin \
-		--with-unitermwin \
-		--with-ps=gs \
-		--enable-ipc \
-		--with-etex \
-		--without-dvipng \
-		--without-dvipdfm \
-		--without-dvipdfmx \
-		$(use_with X x) \
-		${my_conf} || die "econf"
-
-	if use X && use ppc-macos ; then
-		for f in $(find ${S} -name config.status) ; do
-			sed -i -e "s:-ldl::g" $f
-		done
-	fi
-
-	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" texmf=${TEXMF_PATH:-/usr/share/texmf} || die "make"
-}
-
-src_test() {
-	fmtutil --fmtdir "${S}/texk/web2c" --all
-	Xmake check || die "Xmake check failed."
-}
-
-src_install() {
-	dodir /usr/share/
-	cp -R texmf ${D}/usr/share
-	cp -R texmf-dist ${D}/usr/share
-
-	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
-	einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH:-/usr/share/texmf} || die "install"
-
-	dosbin ${FILESDIR}/${PV}/texmf-update
-
-	docinto texk
-	cd ${S}/TeX/texk
-	dodoc ChangeLog README
-
-	docinto kpathesa
-	cd ${S}/TeX/texk/kpathsea
-	dodoc BUGS ChangeLog NEWS PROJECTS README
-
-	docinto dviljk
-	cd ${S}/TeX/texk/dviljk
-	dodoc ChangeLog README NEWS
-
-	docinto dvipsk
-	cd ${S}/TeX/texk/dvipsk
-	dodoc ChangeLog README
-
-	docinto makeindexk
-	cd ${S}/TeX/texk/makeindexk
-	dodoc ChangeLog NEWS NOTES README
-
-	docinto ps2pkm
-	cd ${S}/TeX/texk/ps2pkm
-	dodoc ChangeLog README README.14m
-
-	docinto web2c
-	cd ${S}/TeX/texk/web2c
-	dodoc ChangeLog NEWS PROJECTS README
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}
-		mv ${D}/usr/share/texmf/doc/* \
-			${D}/usr/share/doc/${PF} \
-			|| die "mv doc failed."
-		cd ${D}/usr/share/texmf
-		rmdir doc
-		ln -s ../doc/${PF} doc || die "ln -s doc failed."
-		cd -
-	else
-		rm -rf ${D}/usr/share/texmf/doc
-	fi
-
-	dodir /var/cache/fonts
-
-	# root group name doesn't exist on Mac OS X
-	chown -R 0:0 ${D}/usr/share/texmf
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c"' > ${D}/etc/env.d/98tetex
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-	# _not_ ${TEXMF_PATH}
-	cd ${D}/usr/share/texmf
-	for d in $(find . -name config -type d | sed -e "s:\./::g") ; do
-		dodir /etc/texmf/${d}
-		for f in $(find ${D}usr/share/texmf/$d -maxdepth 1 -mindepth 1); do
-			mv $f ${D}/etc/texmf/$d || die "mv $f failed"
-			dosym /etc/texmf/$d/$(basename $f) /usr/share/texmf/$d/$(basename $f)
-		done
-	done
-	cd -
-	cd ${D}/${TEXMF_PATH}
-	for f in $(find . -name '*.cnf' -o -name '*.cfg' -type f | sed -e "s:\./::g") ; do
-		if [ "${f/config/}" != "${f}" ] ; then
-			continue
-		fi
-		dodir /etc/texmf/$(dirname $f)
-		mv ${D}/${TEXMF_PATH}/$f ${D}/etc/texmf/$(dirname $f) || die "mv $f failed."
-		dosym /etc/texmf/$f ${TEXMF_PATH}/$f
-	done
-
-	# take care of updmap.cfg, fmtutil.cnf and texmf.cnf
-	dodir /etc/texmf/{updmap.d,fmtutil.d,texmf.d}
-	dosym /etc/texmf/web2c/updmap.cfg ${TEXMF_PATH}/web2c/updmap.cfg
-	mv ${D}/usr/share/texmf/web2c/updmap.cfg ${D}/etc/texmf/updmap.d/00updmap.cfg
-	mv ${D}/etc/texmf/web2c/fmtutil.cnf ${D}/etc/texmf/fmtutil.d/00fmtutil.cnf
-	mv ${D}/etc/texmf/web2c/texmf.cnf ${D}/etc/texmf/texmf.d/00texmf.cnf
-
-	# xdvi
-	if use X ; then
-		dodir /etc/X11/app-defaults /etc/texmf/xdvi
-		mv ${D}${TEXMF_PATH}/xdvi/XDvi ${D}/etc/X11/app-defaults || die "mv XDvi failed"
-		dosym /etc/X11/app-defaults/XDvi ${TEXMF_PATH}/xdvi/XDvi
-	fi
-
-	doman ${S}/texk/web2c/pdftexdir/pdftosrc.1
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	cd ${D}/usr/bin/
-	ln -snf tex virtex
-	ln -snf pdftex pdfvirtex
-}
-
-pkg_preinst() {
-	ewarn "Removing ${ROOT}usr/share/texmf/web2c"
-	rm -rf "${ROOT}usr/share/texmf/web2c"
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] ; then
-		/usr/sbin/texmf-update
-	fi
-
-	elog
-	elog "If you have configuration files in /etc/texmf to merge,"
-	elog "please update them and run /usr/sbin/texmf-update."
-	elog
-}