remove old

Package-Manager: portage-2.1.2-r12

32 files changed, 0 insertions, 2382 deletions

diff --git a/app-text/ghostscript-esp/files/digest-ghostscript-esp-7.07.1-r10 b/app-text/ghostscript-esp/files/digest-ghostscript-esp-7.07.1-r10
deleted file mode 100644
index 53fc231655df..000000000000
--- a/app-text/ghostscript-esp/files/digest-ghostscript-esp-7.07.1-r10
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
-RMD160 14f436cb2869788f249c0eaf5dd6a31295c5ada7 adobe-cmaps-200204.tar.gz 4360486
-SHA256 510f29086630db1a581ab77e46c3a6b9b4ee4bf8c7717c209e5125794a59480a adobe-cmaps-200204.tar.gz 4360486
-MD5 d30bf5c09f2c7caa8291f6305cf03044 espgs-7.07.1-source.tar.bz2 5400198
-RMD160 ba0d06c2e3ef55c2b716d6df9855d38a8e4216ae espgs-7.07.1-source.tar.bz2 5400198
-SHA256 7e0ed705da90a4c65368675d68ccecb871f89cb06d2efc61ddd0bb5fee5570f2 espgs-7.07.1-source.tar.bz2 5400198
diff --git a/app-text/ghostscript-esp/files/digest-ghostscript-esp-8.15.1_p20060430 b/app-text/ghostscript-esp/files/digest-ghostscript-esp-8.15.1_p20060430
deleted file mode 100644
index 31704d47df8f..000000000000
--- a/app-text/ghostscript-esp/files/digest-ghostscript-esp-8.15.1_p20060430
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
-RMD160 14f436cb2869788f249c0eaf5dd6a31295c5ada7 adobe-cmaps-200204.tar.gz 4360486
-SHA256 510f29086630db1a581ab77e46c3a6b9b4ee4bf8c7717c209e5125794a59480a adobe-cmaps-200204.tar.gz 4360486
-MD5 10714fced522f4922b78989b21133fc7 espgs-8.15.1_p20060430-source.tar.bz2 8501375
-RMD160 0e386705337f9348a08a886e544738f826335e92 espgs-8.15.1_p20060430-source.tar.bz2 8501375
-SHA256 342773230bdd8f5661a89176880098918bfdd0e53357389c2a051f982de027aa espgs-8.15.1_p20060430-source.tar.bz2 8501375
-MD5 fcd47a90e8d71d03f6c53c4ba7698b24 ghostscript-esp-8.15.1-ubuntu4.patch.bz2 23402
-RMD160 577f3c4d7ef541ccc90b53536748f30ab4db3dc7 ghostscript-esp-8.15.1-ubuntu4.patch.bz2 23402
-SHA256 05032ac9986620594394e20ca2de1d0a2cb0c49c06dbaadb0bc17ed57d8ebc47 ghostscript-esp-8.15.1-ubuntu4.patch.bz2 23402
diff --git a/app-text/ghostscript-esp/files/ghostscript-7.07-bigposttable.patch b/app-text/ghostscript-esp/files/ghostscript-7.07-bigposttable.patch
deleted file mode 100644
index bfd670abf4c4..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-7.07-bigposttable.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN ghostscript-7.07.orig/lib/gs_ttf.ps ghostscript-7.07/lib/gs_ttf.ps
---- ghostscript-7.07.orig/lib/gs_ttf.ps	2003-04-12 23:02:38.000000000 +0900
-+++ ghostscript-7.07/lib/gs_ttf.ps	2003-07-24 19:00:37.000000000 +0900
-@@ -575,7 +575,7 @@
-   (maxp) 1 index
-   (name) 1 index
-   (OS/2) 1 index
--  (post) 1 index
-+  (post) { .readbigtable }
-   (vhea) 1 index
- 	% Big tables
-   (glyf) { .readbigtable }
-@@ -918,10 +918,17 @@
-   DEBUG { (fontname ) print fontname = } if
- 		% Stack: ... /FontInfo mark key1 value1 ...
-   post null ne {
--    /ItalicAngle post 4 gets32 65536.0 div
--    /isFixedPitch post 12 getu32 0 ne
--    /UnderlinePosition post 8 gets16 upem div
--    /UnderlineThickness post 10 gets16 upem div
-+    post type /arraytype eq {
-+      % this post table is a big table. /post should be [(...) ...]
-+      % data we actually need here should be first one in array.
-+      /posttable post 1 get def
-+    } {
-+      /posttable post def
-+    } ifelse
-+    /ItalicAngle posttable 4 gets32 65536.0 div
-+    /isFixedPitch posttable 12 getu32 0 ne
-+    /UnderlinePosition posttable 8 gets16 upem div
-+    /UnderlineThickness posttable 10 gets16 upem div
-   } if
-   counttomark 0 ne { .dicttomark } { pop pop } ifelse
-   /XUID [orgXUID 42 curxuid]
diff --git a/app-text/ghostscript-esp/files/ghostscript-7.07-coverage-glyphcount.patch b/app-text/ghostscript-esp/files/ghostscript-7.07-coverage-glyphcount.patch
deleted file mode 100644
index 4c976b467380..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-7.07-coverage-glyphcount.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ruN ghostscript-7.07.orig/lib/gs_ttf.ps ghostscript-7.07/lib/gs_ttf.ps
---- ghostscript-7.07.orig/lib/gs_ttf.ps	2003-08-04 15:23:15.000000000 +0900
-+++ ghostscript-7.07/lib/gs_ttf.ps	2003-08-04 15:22:23.000000000 +0900
-@@ -1104,9 +1104,26 @@
- % 4	2	Offset	Coverage(--)
- % 6	2	uint16	GlyphCount
- % 8	2	GlyphID	Substitute(vertically oriented glyphs)
--% --	2	uint16	SubstFormat
--% +2	2	uint16	GlyphCount(same as above GlyphCount)
--% +4	2	GlyphID	GlyphArray(horizontally oriented glyphs)
-+%
-+% [Coverage Format 1, Individual glyph indices]
-+% Index Size    Type    Name of Entry
-+% -----------------------------------
-+% 0     2       uint16  CoverageFormat (Format identifier-format = 1)
-+% 2     2       uint16  GlyphCount (same as above GlyphCount)
-+% 4     2       GlyphID GlyphArray (horizontally oriented glyphs)
-+%
-+% [Coverage Format 2, Range of glyphs
-+% Index Size    Type    Name of Entry
-+% -----------------------------------
-+% 0     2       uint16  CoverageFormat (Format identifier-format = 2)
-+% 2     2       uint16  RangeCount
-+% 4     2       struct  RangeRecord[RangeCount]
-+% [RangeRecord]
-+% Index Size    Type    Name of Entry
-+% -----------------------------------
-+% 0     2       GlyphID First GlyphID in the range
-+% 2     2       GlyphID Last GlyphID in the range
-+% 4     2       uint16  Coverage Index of first GlpyhID in range
- % -----------------------------------
- % References
- % 1. http://www.microsoft.com/typography/OTSPEC/gsub.htm
-@@ -1161,10 +1178,13 @@
- 	      %dup /gsubvog exch gsubost 6 add gsubglc getinterval def
- 	      %dup /gsubhog exch gsubost gsubocv add 4 add gsubglc getinterval def
- 	      dup /gsubvog exch gsubost 6 add gsubglc 2 mul getinterval def
--	      dup /gsubhog exch gsubost gsubocv add 4 add gsubglc 2 mul getinterval def
-+	      dup /cvfmt exch gsubost gsubocv add 0 add getu16 def
-+	      dup /cvglc exch gsubost gsubocv add 2 add getu16 def
-+	      dup /gsubhog exch gsubost gsubocv add 4 add cvglc 2 mul getinterval def
- 	      DEBUG {
- 		(gsubocv: ) print gsubocv =
- 		(gsubglc: ) print gsubglc =
-+		(cvfmt: ) print cvfmt =
- 
- 		(gsubhog->gsubvog ) =
- 		0 2 gsubhog length 2 sub { % for
-@@ -1174,10 +1194,31 @@
- 		  gsubvog exch getu16 =
- 		} for
- 	      } if
--	      /gsubh2v << 0 2 gsubhog length 2 sub {
--		dup gsubhog exch getu16
--		exch gsubvog exch getu16
--	      } for >> def
-+	      cvfmt 1 eq {
-+		/gsubh2v << 0 2 gsubhog length 2 sub {
-+		  dup gsubhog exch getu16
-+		  exch gsubvog exch getu16
-+		} for >> def
-+	      } {
-+		cvfmt 2 eq {
-+		  /gsubh2v << 0 6 gsubhog length 6 sub {
-+		    dup 0 add /fgid exch gsubhog exch getu16 def
-+		    dup 2 add /lgid exch gsubhog exch getu16 def
-+		    4 add /cvidx exch gsubhog exch getu16 def
-+		    DEBUG {
-+		      (fgid: ) print fgid =
-+		      (lgid: ) print lgid =
-+		      (cvidx: ) print cvidx =
-+		    } if
-+		    fgid 1 lgid {
-+		      dup cvidx add fgid sub
-+		      exch gsubvog exch getu16
-+		    } for
-+		  } for >> def
-+		} {
-+		  %(UNKNWON COVERAGE FORMAT.) = flush
-+		} ifelse
-+	      } ifelse
- 	    } {
- 	      %(UNKNOWN GSUB FORMAT.) = flush
- 	    } ifelse
diff --git a/app-text/ghostscript-esp/files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch b/app-text/ghostscript-esp/files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch
deleted file mode 100644
index a5e0771fe00a..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch
+++ /dev/null
@@ -1,194 +0,0 @@
---- ./src/gdevpdff.h.org	2003-01-17 09:49:02.000000000 +0900
-+++ ./src/gdevpdff.h	2003-09-18 23:42:38.000000000 +0900
-@@ -117,6 +117,12 @@
-     FONT_SUBSET_NO
- } pdf_font_do_subset_t;
- 
-+typedef enum {
-+    FONT_EMBED_STANDARD,	/* 14 standard fonts */
-+    FONT_EMBED_NO,
-+    FONT_EMBED_YES
-+} pdf_font_embed_t;
-+
- struct pdf_font_descriptor_s {
-     pdf_resource_common(pdf_font_descriptor_t);
-     pdf_font_name_t FontName;
-@@ -198,6 +204,7 @@
-     gs_font *font;		/* non-0 iff font will notify us; */
- 				/* should be a weak pointer */
-     int index;			/* in pdf_standard_fonts, -1 if not base 14 */
-+    pdf_font_embed_t embed;	/* status of pdf_font_embed_status() */
-     gs_matrix orig_matrix;	/* FontMatrix of unscaled font for embedding */
-     bool is_MM_instance;	/* for Type 1/2 fonts, true iff the font */
- 				/* is a Multiple Master instance */
-@@ -320,12 +327,6 @@
- 
- /* ---------------- Exported by gdevpdff.c ---------------- */
- 
--typedef enum {
--    FONT_EMBED_STANDARD,	/* 14 standard fonts */
--    FONT_EMBED_NO,
--    FONT_EMBED_YES
--} pdf_font_embed_t;
--
- typedef struct pdf_standard_font_s {
-     const char *fname;
-     gs_encoding_index_t base_encoding;
---- ./src/gdevpdff.c.org	2003-01-17 09:49:02.000000000 +0900
-+++ ./src/gdevpdff.c	2003-09-21 05:08:36.000000000 +0900
-@@ -276,6 +276,11 @@
-     const byte *chars = font->font_name.chars;
-     uint size = font->font_name.size;
- 
-+    /* CIDFonts has null string in font_name, key_name is used */
-+    if (0 == size) {
-+	chars = font->key_name.chars;
-+	size = font->key_name.size;
-+    }
-     /*
-      * The behavior of Acrobat Distiller changed between 3.0 (PDF 1.2),
-      * which will never embed the base 14 fonts, and 4.0 (PDF 1.3), which
-@@ -720,19 +725,22 @@
- 	same &= ~FONT_SAME_METRICS;
- 	break;
-     case FONT_EMBED_NO:
--	/*
--	 * Per the PDF 1.3 documentation, there are only 3 BaseEncoding
--	 * values allowed for non-embedded fonts.  Pick one here.
--	 */
--	BaseEncoding =
--	    ((const gs_font_base *)base_font)->nearest_encoding_index;
--	switch (BaseEncoding) {
--	default:
--	    BaseEncoding = ENCODING_INDEX_WINANSI;
--	case ENCODING_INDEX_WINANSI:
--	case ENCODING_INDEX_MACROMAN:
--	case ENCODING_INDEX_MACEXPERT:
--	    break;
-+	if (!(font->FontType == ft_CID_encrypted ||
-+	      font->FontType == ft_CID_TrueType)) {
-+	    /*
-+	     * Per the PDF 1.3 documentation, there are only 3 BaseEncoding
-+	     * values allowed for non-embedded fonts.  Pick one here.
-+	     */
-+	    BaseEncoding =
-+	        ((const gs_font_base *)base_font)->nearest_encoding_index;
-+	    switch (BaseEncoding) {
-+	    default:
-+	        BaseEncoding = ENCODING_INDEX_WINANSI;
-+	    case ENCODING_INDEX_WINANSI:
-+	    case ENCODING_INDEX_MACROMAN:
-+	    case ENCODING_INDEX_MACEXPERT:
-+	        break;
-+	    }
- 	}
- 	code = pdf_compute_font_descriptor(pdev, &fdesc, font, NULL);
- 	if (code < 0)
-@@ -888,6 +896,7 @@
- 	memcpy(ppf->widths_known, ftemp_widths_known,
- 	       sizeof(ftemp_widths_known));
-     }
-+    ppf->embed = embed;
-     code = pdf_register_font(pdev, font, ppf);
- 
-     *pppf = ppf;
---- ./src/gdevpdfw.c.org	2003-01-17 09:49:02.000000000 +0900
-+++ ./src/gdevpdfw.c	2003-09-25 17:50:54.000000000 +0900
-@@ -348,18 +348,19 @@
-     /* Use the most common width as DW. */
- 
-     {
--	ushort counts[1001];
-+        ushort counts[1500*2]; /* histogram of (-1500..1500) */
- 	int dw_count = 0, i;
- 
- 	memset(counts, 0, sizeof(counts));
- 	while (!psf_enumerate_glyphs_next(&genum, &glyph)) {
--	    int width = ppf->Widths[glyph - gs_min_cid_glyph];
-+	    int cid = glyph - gs_min_cid_glyph;
-+	    int width = ppf->Widths[cid];
- 
--	    counts[min(width, countof(counts) - 1)]++;
-+	    counts[max(0,min(width+countof(counts)/2,countof(counts)-1))]++;
- 	}
--	for (i = 0; i < countof(counts); ++i)
-+	for (i = 0; i < countof(counts); i++)
- 	    if (counts[i] > dw_count)
--		dw = i, dw_count = counts[i];
-+		dw = i - countof(counts)/2, dw_count = counts[i];
- 	if (dw != 0)
- 	    pprintd1(s, "/DW %d\n", dw);
-     }
-@@ -496,14 +497,16 @@
- 	if (pdf_has_subset_prefix(chars, size))
- 	    chars += SUBSET_PREFIX_SIZE, size -= SUBSET_PREFIX_SIZE;
- 	pdf_put_name(pdev, chars, size);
--	if (pef->sub_font_type == ft_CID_encrypted &&
-+	if ((pef->sub_font_type == ft_CID_encrypted ||
-+	     pef->sub_font_type == ft_CID_TrueType) &&
- 	    pef->cmapname[0] == '/'
- 	    ) {
- 	    stream_putc(s, '-');
- 	    pdf_put_name_chars(pdev, (const byte*) (pef->cmapname + 1),
- 			       strlen(pef->cmapname + 1));
- 	}
--	pprints1(s, "/Encoding %s", pef->cmapname);
-+	pprints1(s, (pef->cmapname[0] == '/') ? "/Encoding%s" : "/Encoding %s",
-+		 pef->cmapname);
- 	pprintld1(s, "/DescendantFonts[%ld 0 R]",
- 		pdf_resource_id((const pdf_resource_t *)pef->DescendantFont));
- 	write_Widths = 0;
-@@ -563,8 +566,10 @@
- 	break;
-     case -1:
- 	pdf_write_CIDFont_widths(pdev, pef);
--	if (pef->FontType == ft_CID_TrueType)
--	    pdf_write_CIDToGIDMap(pdev, pef, &cidmap_id);
-+	if (pef->FontType == ft_CID_TrueType) {
-+	    if (pef->embed != FONT_EMBED_NO)
-+	        pdf_write_CIDToGIDMap(pdev, pef, &cidmap_id);
-+	}
- 	break;
-     }
-     if (pef->Differences) {
---- ./src/gdevpdfs.c.org	2003-09-20 00:11:16.000000000 +0900
-+++ ./src/gdevpdfs.c	2003-09-25 17:44:10.000000000 +0900
-@@ -481,15 +481,21 @@
- 
- 	    if (cid < pfd->chars_count) {
- 		int index = cid >> 3, mask = 0x80 >> (cid & 7);
-+		int gid;
-+
-+		if (!(pfd->chars_used.data[index] & mask) ||
-+		    !(psubf->widths_known[index] & mask)) {
- 
--		if (!(pfd->chars_used.data[index] & mask)) {
--		    pfd->chars_used.data[index] |= mask;
- 		    if (psubf->CIDToGIDMap) {
- 			gs_font_cid2 *const subfont2 =
- 			    (gs_font_cid2 *)subfont;
--			int gid =
--			    subfont2->cidata.CIDMap_proc(subfont2, glyph);
- 
-+			gid = subfont2->cidata.CIDMap_proc(subfont2, glyph);
-+		    }
-+		}
-+		if (!(pfd->chars_used.data[index] & mask)) {
-+		    pfd->chars_used.data[index] |= mask;
-+		    if (psubf->CIDToGIDMap) {
- 			if (gid >= 0) {
- 			    psubf->CIDToGIDMap[cid] = gid;
- 			    mark_glyphs_used(subfont, gid + gs_min_cid_glyph,
-@@ -500,7 +506,11 @@
- 		if (!(psubf->widths_known[index] & mask)) {
- 		    int width;
- 
--		    code = pdf_glyph_width(psubf, glyph, subfont, &width);
-+		    if (psubf->CIDToGIDMap)
-+			code = pdf_glyph_width(psubf, gid + gs_min_cid_glyph,
-+					       subfont, &width);
-+		    else
-+		        code = pdf_glyph_width(psubf, glyph, subfont, &width);
- 		    if (code == 0) {
- 			psubf->Widths[cid] = width;
- 			psubf->widths_known[index] |= mask;
diff --git a/app-text/ghostscript-esp/files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch b/app-text/ghostscript-esp/files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch
deleted file mode 100644
index 17f8a3da7c19..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./lib/gs_cidfn.ps.org	2003-04-12 23:02:38.000000000 +0900
-+++ ./lib/gs_cidfn.ps	2003-09-03 07:28:28.000000000 +0900
-@@ -511,9 +511,32 @@
- 
- .loadinitialcidfonts
- 
-+% <fontname> <font> .RenameFontForNeverEmbed <fontname> <font'>
-+/.RenameFontForNeverEmbed {
-+    /DEVICE where { pop DEVICE (pdfwrite) eq {
-+        currentdistillerparams /NeverEmbed get {
-+            2 index eq {
-+                (*** unembeddable CIDFont: ) print 1 index == flush
-+                dup length 1 add dict copy
-+                dup /FID undef
-+                dup /.orig_CIDFontName 1 index /CIDFontName get put
-+                dup /CIDFontName 3 index dup type /stringtype eq {
-+                    dup rcheck {
-+                        dup length string 0 1 2 index length 1 sub {
-+                            2 index 1 index get 3 copy put pop pop
-+                        } for exch pop
-+                    } if
-+                } if put
-+                dup /FontName 1 index /CIDFontName get put
-+            } if
-+        } forall
-+    } if } if
-+} bind def
-+
- /CIDFontmapHandler <<
-   /nametype {
-     /CIDFont findresource
-+    .RenameFontForNeverEmbed
-     /CIDFont defineresource pop
-   } bind
-   /stringtype {
-@@ -528,6 +551,7 @@
- 	      pop pop
- 	  } {
- 	      % Give a name different from the name defined in the file
-+	      .RenameFontForNeverEmbed
- 	      /CIDFont defineresource pop
- 	  } ifelse
-       } {
-@@ -546,6 +570,7 @@
- 	  3 -1 roll put
- 	  % Expand array
- 	  aload pop .loadcjkvttcidfont
-+	  .RenameFontForNeverEmbed
- 	  /CIDFont defineresource pop
-       } {
- 	  /undefinedresource signalerror
diff --git a/app-text/ghostscript-esp/files/ghostscript-7.07-gsublookuptable.patch b/app-text/ghostscript-esp/files/ghostscript-7.07-gsublookuptable.patch
deleted file mode 100644
index 424441b03928..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-7.07-gsublookuptable.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ruN ghostscript-7.07.orig/lib/gs_ttf.ps ghostscript-7.07/lib/gs_ttf.ps
---- ghostscript-7.07.orig/lib/gs_ttf.ps	2003-07-29 16:51:55.000000000 +0900
-+++ ghostscript-7.07/lib/gs_ttf.ps	2003-07-29 17:44:43.000000000 +0900
-@@ -1117,50 +1117,77 @@
-   /gsubh2v null def
-   tabdict /GSUB .knownget { % if
-     dup /gsubver exch 0 getu32 def
--    %dup /gsubosl exch 4 getu16 12 add def
--    %dup /gsubofl exch 6 getu16 12 add def
--    dup /gsuboll exch 8 getu16 12 add def
-+    %dup /gsubosl exch 4 getu16 def
-+    %dup /gsubofl exch 6 getu16 def
-+    dup /gsuboll exch 8 getu16 def
-     DEBUG {
-       (gsubver: ) print gsubver =
-       %(gsubosl: ) print gsubosl =
-       %(gsubofl: ) print gsubofl =
-       (gsuboll: ) print gsuboll =
-     } if
--    dup /gsubfmt exch gsuboll 0 add getu16 def
-+    % /gsuboll should be pointed out the LookupList table, but not Lookup table.
-+    % so this is wrong:
-+    % dup /gsubfmt exch gsuboll 0 add getu16 def
-+    dup /gsublc exch gsuboll 0 add getu16 def
-     DEBUG {
--      (gsubfmt: ) print gsubfmt =
-+      (gsublc: ) print gsublc =
-     } if
--%    gsubver 16#00010000 eq { % ifelse
--      gsubfmt 2 eq { % ifelse
--	dup /gsubocv exch gsuboll 2 add getu16 def
--	dup /gsubglc exch gsuboll 4 add getu16 def
--	% hacked by suzuki toshiya at 2001/3/6
--	%dup /gsubvog exch gsuboll 6 add gsubglc getinterval def
--	%dup /gsubhog exch gsuboll gsubocv add 4 add gsubglc getinterval def
--	dup /gsubvog exch gsuboll 6 add gsubglc 2 mul getinterval def
--	dup /gsubhog exch gsuboll gsubocv add 4 add gsubglc 2 mul getinterval def
-+    gsublc 0 ne {
-+      0 1 gsublc 1 sub {
-+	2 mul /gsubolt exch 2 index exch gsuboll 2 add add getu16 gsuboll add def
-+	dup /gsubltype exch gsubolt 0 add getu16 def
-+	dup /gsublflag exch gsubolt 2 add getu16 def
-+	dup /gsubsubc exch gsubolt 4 add getu16 def
- 	DEBUG {
--	  (gsubocv: ) print gsubocv =
--	  (gsubglc: ) print gsubglc =
--
--	  (gsubhog->gsubvog ) =
--	  0 2 gsubhog length 2 sub { % for
--	    dup
--	    gsubhog exch getu16 =only
--	    (->) =only
--	    gsubvog exch getu16 =
-+	  (gsubolt: ) print gsubolt =
-+	  (gsubltype: ) print gsubltype =
-+	  (gsublflag: ) print gsublflag =
-+	  (gsubsubc: ) print gsubsubc =
-+	} if
-+	gsubsubc 0 ne {
-+	  0 1 gsubsubc 1 sub {
-+	    2 mul /gsubost exch 2 index exch gsubolt 6 add add getu16 gsubolt add def
-+	    dup /substfmt exch gsubost 0 add getu16 def
-+	    DEBUG {
-+	      (gsubost: ) print gsubost =
-+	      (substfmt: ) print substfmt =
-+	    } if
-+%	    gsubver 16#00010000 eq { % ifelse
-+	    gsubltype 1 eq substfmt 2 eq and { % ifelse
-+	      dup /gsubocv exch gsubost 2 add getu16 def
-+	      dup /gsubglc exch gsubost 4 add getu16 def
-+	      % hacked by suzuki toshiya at 2001/3/6
-+	      %dup /gsubvog exch gsubost 6 add gsubglc getinterval def
-+	      %dup /gsubhog exch gsubost gsubocv add 4 add gsubglc getinterval def
-+	      dup /gsubvog exch gsubost 6 add gsubglc 2 mul getinterval def
-+	      dup /gsubhog exch gsubost gsubocv add 4 add gsubglc 2 mul getinterval def
-+	      DEBUG {
-+		(gsubocv: ) print gsubocv =
-+		(gsubglc: ) print gsubglc =
-+
-+		(gsubhog->gsubvog ) =
-+		0 2 gsubhog length 2 sub { % for
-+		  dup
-+		  gsubhog exch getu16 =only
-+		  (->) =only
-+		  gsubvog exch getu16 =
-+		} for
-+	      } if
-+	      /gsubh2v << 0 2 gsubhog length 2 sub {
-+		dup gsubhog exch getu16
-+		exch gsubvog exch getu16
-+	      } for >> def
-+	    } {
-+	      %(UNKNOWN GSUB FORMAT.) = flush
-+	    } ifelse
-+%	    } {
-+%	      (ILLEGAL GSUB VERSION.) = flush
-+%	    } ifelse
- 	  } for
- 	} if
--	/gsubh2v << 0 2 gsubhog length 2 sub {
--	  dup gsubhog exch getu16
--	  exch gsubvog exch getu16
--	} for >> def
--      } {
--	%(UNKNOWN GSUB FORMAT.) = flush
--      } ifelse
--%    } {
--%      (ILLEGAL GSUB VERSION.) = flush
--%    } ifelse
-+      } for
-+    } if
-     pop
-   } if
- } bind def
diff --git a/app-text/ghostscript-esp/files/ghostscript-badc.patch b/app-text/ghostscript-esp/files/ghostscript-badc.patch
deleted file mode 100644
index 1b85a880ba4e..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-badc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- espgs-8.15rc3/src/gdevps.c.badc	2005-02-16 21:21:49.000000000 +0000
-+++ espgs-8.15rc3/src/gdevps.c	2005-06-03 10:56:31.000000000 +0100
-@@ -1164,7 +1164,7 @@
-     gs_rect bbox;
- 
-     gx_device_bbox_bbox(vdev->bbox_device, &bbox);
--    if (pdev->first_page & !vdev->in_page) {
-+    if (pdev->first_page && !vdev->in_page) {
- 	/* Nothing has been written.  Write the file header now. */
- 	code = psw_begin_file(pdev, &bbox);
-         if (code < 0)
---- espgs-8.15rc3/src/scfd.c.badc	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15rc3/src/scfd.c	2005-06-03 10:56:31.000000000 +0100
-@@ -305,7 +305,7 @@
- 	 * in the string of initial zeros in the EOL.  If EndOfLine
- 	 * is false, we aren't sure what we should do....
- 	 */
--	if (ss->EncodedByteAlign & !ss->EndOfLine)
-+	if (ss->EncodedByteAlign && !ss->EndOfLine)
- 	    ss->bits_left &= ~7;
-     }
-     /* If we're between scan lines, scan for EOLs. */
diff --git a/app-text/ghostscript-esp/files/ghostscript-build.patch b/app-text/ghostscript-esp/files/ghostscript-build.patch
deleted file mode 100644
index 25cf8c505f54..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- espgs-8.15rc3/src/unix-dll.mak.build	2005-06-03 12:49:36.000000000 +0100
-+++ espgs-8.15rc3/src/unix-dll.mak	2005-06-03 12:49:59.000000000 +0100
-@@ -87,7 +87,7 @@
- 
- # Normal shared object
- so: SODIRS
--	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
-+	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS) $(ACDEFS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
- 
- # Debug shared object
- # Note that this is in the same directory as the normal shared
---- espgs-8.15rc3/src/devs.mak.build	2005-06-03 22:41:16.000000000 +0100
-+++ espgs-8.15rc3/src/devs.mak	2005-06-03 22:42:54.000000000 +0100
-@@ -457,7 +457,7 @@
- 	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
- 
- $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
--	$(GLCC) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
-+	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
- 
- $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
-  $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
---- espgs-8.15rc3/src/lib.mak.build	2005-06-03 22:51:22.000000000 +0100
-+++ espgs-8.15rc3/src/lib.mak	2005-06-03 22:52:11.000000000 +0100
-@@ -847,7 +847,7 @@
- $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
-  $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
-  $(gstypes_h)
--	$(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
-+	$(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
- 
- # Future replacement for gsparams.c
- $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
-
- # Provide a mapping between StandardEncoding and ISOLatin1Encoding.
- $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h)
--	$(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
-+	$(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
- 
- ###### Create a pseudo-"feature" for the entire graphics library.
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-7.07.1-64bit-cmyk.patch b/app-text/ghostscript-esp/files/ghostscript-esp-7.07.1-64bit-cmyk.patch
deleted file mode 100644
index ac14b91bba83..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-7.07.1-64bit-cmyk.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: gs/src/gdevbmp.c
-===================================================================
-RCS file: /cvs/ghostscript/gs/src/gdevbmp.c,v
-retrieving revision 1.10
-diff -b -u -r1.10 gdevbmp.c
---- gs/src/gdevbmp.c	20 Sep 2004 22:14:59 -0000	1.10
-+++ gs/src/gdevbmp.c	2 Aug 2005 12:02:44 -0000
-@@ -147,6 +147,7 @@
- 
-     if (row == 0)		/* can't allocate row buffer */
- 	return_error(gs_error_VMerror);
-+    memset(row+raster, 0, bmp_raster - raster); /* clear the padding bytes */

- 
-     /* Write the file header. */
- 
-@@ -174,7 +175,7 @@
- bmp_cmyk_print_page(gx_device_printer * pdev, FILE * file)
- {
-     int plane_depth = pdev->color_info.depth / 4;
--    uint raster = bitmap_raster(pdev->width * plane_depth);
-+    uint raster = (pdev->width * plane_depth + 7) >> 3;
-     /* BMP scan lines are padded to 32 bits. */
-     uint bmp_raster = raster + (-(int)raster & 3);
-     byte *row = gs_alloc_bytes(pdev->memory, bmp_raster, "bmp file buffer");
-@@ -184,6 +185,7 @@
- 
-     if (row == 0)		/* can't allocate row buffer */
- 	return_error(gs_error_VMerror);
-+    memset(row+raster, 0, bmp_raster - raster); /* clear the padding bytes */
- 
-     for (plane = 0; plane <= 3; ++plane) {
- 	gx_render_plane_t render_plane;
-Index: gs/src/gdevbmpc.c
-===================================================================
-RCS file: /cvs/ghostscript/gs/src/gdevbmpc.c,v
-retrieving revision 1.7
-diff -b -u -r1.7 gdevbmpc.c
---- gs/src/gdevbmpc.c	17 Oct 2002 06:09:33 -0000	1.7
-+++ gs/src/gdevbmpc.c	2 Aug 2005 12:02:44 -0000
-@@ -207,7 +207,7 @@
-     }
-     return write_bmp_depth_header(pdev, file, plane_depth,
- 				  (const byte *)palette,
--				  bitmap_raster(pdev->width * plane_depth));
-+				  (pdev->width*plane_depth + 7) >> 3);
- }
- 
- /* 24-bit color mappers (taken from gdevmem2.c). */
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-bsd.patch b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-bsd.patch
deleted file mode 100644
index e85d32458267..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-bsd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- espgs-8.15.1/src/configure.ac
-+++ espgs-8.15.1/src/configure.ac
-@@ -742,8 +742,16 @@
- 		DYNAMIC_LIBS="-rdynamic -ldl"
- 		X_DEVS=""
- 		;;
-+		*BSD)
-+		DYNAMIC_CFLAGS="-fPIC"
-+		DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
-+		DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
-+		DYNAMIC_LDFLAGS="-fPIC -shared"
-+		DYNAMIC_LIBS=""
-+		X_DEVS=""
-+		;;
- 		*)
--		AC_MSG_ERROR(Sorry, dynamic driver support not available on this platform!)
-+		AC_MSG_ERROR([Sorry, dynamic driver support not available on this platform!])
- 		;;
- 	esac
- ])
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-fPIC.patch b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-fPIC.patch
deleted file mode 100644
index e4e0da53bd55..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-fPIC.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/configure.ac	2005-09-22 19:14:28.000000000 +0200
-+++ src/configure.ac	2006-02-07 21:31:16.000000000 +0100
-@@ -726,9 +726,9 @@
- AC_SUBST(FILES)
- 
- dnl Dynamic device support.
--DYNAMIC_CFLAGS=""
-+DYNAMIC_CFLAGS="-fPIC"
- DYNAMIC_DEVS=""
--DYNAMIC_FLAGS=""
-+DYNAMIC_FLAGS="-fPIC -shared"
- DYNAMIC_LDFLAGS=""
- DYNAMIC_LIBS=""
- 
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-ps2epsi-esp.diff b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-ps2epsi-esp.diff
deleted file mode 100644
index ecf51a060dfd..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-ps2epsi-esp.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ghostscript/lib/ps2epsi.orig	2006-04-03 18:19:52.000000000 +0200
-+++ ghostscript/lib/ps2epsi	2006-04-03 18:21:17.000000000 +0200
-@@ -6,11 +6,6 @@
- fi
- 
- tmpfile=`mktemp ${TMPDIR-/tmp}/ps2epsi.XXXXXX`
--rm -f $tmpfile
--if test -e $tmpfile; then
--	echo "$0: Our temporary file $tmpfile already exists." 1>&2
--	exit 1
--fi
- trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
- 
- export outfile
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-build.patch b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-build.patch
deleted file mode 100644
index 78991a084a6b..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- espgs-8.15.1_p9999/src/unix-dll.mak.orig	2006-04-29 23:36:28.000000000 +0200
-+++ espgs-8.15.1_p9999/src/unix-dll.mak	2006-04-29 23:33:57.000000000 +0200
-@@ -87,7 +87,7 @@
- 
- # Normal shared object
- so: SODIRS
--	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
-+	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS) $(ACDEFS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
- 
- # Debug shared object
- # Note that this is in the same directory as the normal shared
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-destdir.diff b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-destdir.diff
deleted file mode 100644
index 7b791a7ab3fc..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-destdir.diff
+++ /dev/null
@@ -1,324 +0,0 @@
-diff -urN espgs-8.15.1.orig/addons/addons.mak espgs-8.15.1/addons/addons.mak
---- espgs-8.15.1.orig/addons/addons.mak	2005-08-16 10:07:21.000000000 +0000
-+++ espgs-8.15.1/addons/addons.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -953,9 +953,9 @@
- 	$(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
- 
- extra-dmprt-install:
--	$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
--	$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
--	$(INSTALL_DATA) $(JAPSRC)escp_24.src $(install_prefix)$(gsdatadir)$(D)lib || exit 1
-+	$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
-+	$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
-+	$(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
- 
- 
- 
-@@ -1095,7 +1095,7 @@
- 
- extra-upp-install:
- 	for f in $(ADSRC)uniprint$(D)*.upp; do \
--	    $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)$(D)lib || exit 1; \
-+	    $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
- 	done
- 
- ### ------------ Build/Install special features ------------ ###
-diff -urN espgs-8.15.1.orig/pstoraster/cups.mak espgs-8.15.1/pstoraster/cups.mak
---- espgs-8.15.1.orig/pstoraster/cups.mak	2005-02-21 16:17:00.000000000 +0000
-+++ espgs-8.15.1/pstoraster/cups.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -24,9 +24,9 @@
- 
- cups_=	$(GLOBJ)gdevcups.$(OBJ)
- 
--CUPSSERVER= $(install_prefix)`cups-config --serverbin`
--CUPSCONFIG= $(install_prefix)`cups-config --serverroot`
--CUPSDATA= $(install_prefix)`cups-config --datadir`
-+CUPSSERVER= $(DESTDIR)`cups-config --serverbin`
-+CUPSCONFIG= $(DESTDIR)`cups-config --serverroot`
-+CUPSDATA= $(DESTDIR)`cups-config --datadir`
- 
- $(DD)cups.dev:	$(cups_) $(GLD)page.dev
- 	$(ADDMOD) $(DD)cups -lib cupsimage -lib cups
-diff -urN espgs-8.15.1.orig/src/all-arch.mak espgs-8.15.1/src/all-arch.mak
---- espgs-8.15.1.orig/src/all-arch.mak	2005-01-23 03:49:47.000000000 +0000
-+++ espgs-8.15.1/src/all-arch.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -298,24 +298,24 @@
- # Remove the old gs binary first, so as to preserve the previous
- # gs-x.yy version, if any.
- install-binary:
--	-$(RM) $(BINDIR)/$(GS)
-+	-$(RM) $(DESTDIR)$(BINDIR)/$(GS)
- 	@$(MAKE) $(ARGS) install GS=$(GS) XLIBDIRS=$(XLIBDIRSALL) ; \
- 	d=`pwd` ; \
- 	d=`basename $$d` ; \
- 	d=`echo $$d | sed -e s/gs/gs-/` ; \
--	$(RM) $(BINDIR)/$$d ; \
--	ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
--	ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
-+	$(RM) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d
- 
- install-binary-gnu-readline:
--	-$(RM) $(BINDIR)/$(GS)
-+	-$(RM) $(DESTDIR)$(BINDIR)/$(GS)
- 	@$(MAKE) $(ARGS) install GS=$(GS)  XLIBDIRS=$(XLIBDIRSALL) $(GNU_READLINE_ARGS) ; \
- 	d=`pwd` ; \
- 	d=`basename $$d` ; \
- 	d=`echo $$d | sed -e s/gs/gs-/` ; \
--	$(RM) $(BINDIR)/$$d ; \
--	ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
--	ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
-+	$(RM) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d
- 
- install-fontmap:
- 	@d=`pwd` ; \
-@@ -323,14 +323,14 @@
- 	d=`echo $$d | sed -e s/gs//` ; \
- 	if test -f $(GS_SRC_DIR)/Fontmap.new ; \
- 	then \
--		if test -f $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
-+		if test -f $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
- 		then \
- 			true ; \
- 		else \
--			mv $(GS_SHARE_DIR)/$$d/lib/Fontmap $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
-+			mv $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
- 		fi ; \
--		$(CP) $(GS_SRC_DIR)/Fontmap.new $(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
--		ls -l $(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
-+		$(CP) $(GS_SRC_DIR)/Fontmap.new $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
-+		ls -l $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
- 	fi
- 
- install-pdfsec:
-@@ -339,9 +339,9 @@
- 	d=`echo $$d | sed -e s/gs//` ; \
- 	if test -f $(GS_SRC_DIR)/lib/pdf_sec.ps ; \
- 	then \
--		$(MV) $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
--		$(CP) lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
--		$(CHMOD) 664 $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
-+		$(MV) $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
-+		$(CP) lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
-+		$(CHMOD) 664 $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
- 	fi
- 
- #=======================================================================
-diff -urN espgs-8.15.1.orig/src/macos-fw.mak espgs-8.15.1/src/macos-fw.mak
---- espgs-8.15.1.orig/src/macos-fw.mak	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15.1/src/macos-fw.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -103,19 +103,19 @@
- 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
- 
- install-so: so
--	-mkdir $(prefix)
--	-mkdir $(datadir)
--	-mkdir $(gsdir)
--	-mkdir $(gsdatadir)
--	-mkdir $(bindir)
--	-mkdir $(libdir)
--	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
--	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
--	$(RM_) $(libdir)/$(GS_SONAME)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
--	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+	-mkdir $(DESTDIR)$(prefix)
-+	-mkdir $(DESTDIR)$(datadir)
-+	-mkdir $(DESTDIR)$(gsdir)
-+	-mkdir $(DESTDIR)$(gsdatadir)
-+	-mkdir $(DESTDIR)$(bindir)
-+	-mkdir $(DESTDIR)$(libdir)
-+	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
-+	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
-+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
- 
- soinstall: install-so install-scripts install-data
- 
-@@ -144,8 +144,8 @@
- 	cp -r doc $(GS_FRAMEWORK)/Versions/Current
- 
- framework_install : framework
--	rm -rf $(prefix)
--	cp -r $(GS_FRAMEWORK) $(prefix)
-+	rm -rf $(DESTDIR)$(prefix)
-+	cp -r $(GS_FRAMEWORK) $(DESTDIR)$(prefix)
- 
- # Make the build directories
- SODIRS: STDDIRS
-diff -urN espgs-8.15.1.orig/src/unix-dll.mak espgs-8.15.1/src/unix-dll.mak
---- espgs-8.15.1.orig/src/unix-dll.mak	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15.1/src/unix-dll.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -96,19 +96,19 @@
- 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
- 
- install-so: so
--	-mkdir -p $(prefix)
--	-mkdir -p $(datadir)
--	-mkdir -p $(gsdir)
--	-mkdir -p $(gsdatadir)
--	-mkdir -p $(bindir)
--	-mkdir -p $(libdir)
--	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
--	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
--	$(RM_) $(libdir)/$(GS_SONAME)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
--	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+	-mkdir -p $(DESTDIR)$(prefix)
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(bindir)
-+	-mkdir -p $(DESTDIR)$(libdir)
-+	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
-+	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
-+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
- 
- soinstall: install-so install-scripts install-data
- 
-diff -urN espgs-8.15.1.orig/src/unixinst.mak espgs-8.15.1/src/unixinst.mak
---- espgs-8.15.1.orig/src/unixinst.mak	2005-09-22 17:03:45.000000000 +0000
-+++ espgs-8.15.1/src/unixinst.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -28,24 +28,24 @@
- # rules, just in case bindir or scriptdir is a subdirectory of any of these.
- 
- install-exec: STDDIRS $(GS_XE)
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)
--	-mkdir -p $(bindir)
--	$(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(bindir)
-+	$(INSTALL_PROGRAM) $(GS_XE) $(DESTDIR)$(bindir)/$(GS)
- 
- install-scripts: $(PSLIBDIR)/gsnd
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)
--	-mkdir -p $(scriptdir)
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(scriptdir)
- 	$(SH) -c 'for f in \
- gsbj gsdj gsdj500 gslj gslp gsnd \
- bdftops dumphints dvipdf eps2eps font2c \
- pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
- ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps wftopfa \
- fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
--	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(scriptdir); fi;\
-+	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(DESTDIR)$(scriptdir); fi;\
- 	done'
- 
- PSRESDIR=$(PSLIBDIR)/../Resource
-@@ -59,10 +59,10 @@
- # one file from each subdirectory just as a sanity check.
- 
- install-libdata: 
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)
--	-mkdir -p $(install_prefix)$(gsdatadir)/lib
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)/lib
- 	$(SH) -c 'for f in \
- Fontmap Fontmap.GS cidfmap \
- FAPIcidfmap FAPIconfig FAPIfontmap xlatmap \
-@@ -80,24 +80,24 @@
- winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \
- pdf2dsc.ps pdfopt.ps \
- dmp_init.ps dmp_site.ps gdevmjc.ps escp_24.src ;\
--	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(install_prefix)$(gsdatadir)/lib; fi;\
-+	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(DESTDIR)$(gsdatadir)/lib; fi;\
- 	done'
- 	$(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\
--	do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib ;\
-+	do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
- 	done'
- 	$(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
--	do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib ;\
-+	do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
- 	done'
- 
- # install the default resource files
- # copy in every category (directory) but CVS
- RES_CATEGORIES=`ls $(PSRESDIR) | grep -v CVS` 
- install-resdata: $(PSRESDIR)/Decoding/Unicode
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)/Resource
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)/Resource
- 	$(SH) -c 'for dir in $(RES_CATEGORIES); do \
--	  rdir=$(install_prefix)$(gsdatadir)/Resource/$$dir ; \
-+	  rdir=$(DESTDIR)$(gsdatadir)/Resource/$$dir ; \
- 	  test -d $$rdir || mkdir -p $$rdir ; \
- 	  for file in $(PSRESDIR)/$$dir/*; do \
- 	    if test -f $$file; then $(INSTALL_DATA) $$file $$rdir ; fi \
-@@ -118,9 +118,9 @@
- 	   Psfiles.htm Public.htm Readme.htm Release.htm \
- 	   Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
- install-doc: $(PSDOCDIR)/News.htm
--	-mkdir -p $(install_prefix)$(docdir)
-+	-mkdir -p $(DESTDIR)$(docdir)
- 	$(SH) -c 'for f in $(DOC_PAGES) ;\
--	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(install_prefix)$(docdir); fi;\
-+	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(DESTDIR)$(docdir); fi;\
- 	done'
- 
- # install the man pages for each locale
-@@ -129,9 +129,9 @@
- MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
- MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
- install-man: $(PSMANDIR)/gs.1
--	$(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
-+	$(SH) -c 'test -d $(DESTDIR)$(mandir) || mkdir -p $(DESTDIR)$(mandir)'
- 	$(SH) -c 'for d in $(MAN_LCDIRS) ;\
--	do man1dir=$(mandir)/$$d/man$(man1ext) ;\
-+	do man1dir=$(DESTDIR)$(mandir)/$$d/man$(man1ext) ;\
- 	  ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
- 	  for f in $(PSMANDIR)/$$d/*.1 ;\
- 	    do $(INSTALL_DATA) $$f $$man1dir ;\
-@@ -158,18 +158,18 @@
- 
- # install the example files
- install-examples:
--	-mkdir -p $(install_prefix)$(exdir)
-+	-mkdir -p $(DESTDIR)$(exdir)
- 	for f in \
- alphabet.ps colorcir.ps doretree.ps escher.ps \
- golfer.eps grayalph.ps snowflak.ps tiger.eps vasarely.ps waterfal.ps \
- ridt91.eps ;\
--	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(install_prefix)$(exdir) ;\
-+	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(DESTDIR)$(exdir) ;\
- 	done
- 
- install-shared: $(GS_SHARED_OBJS)
- 	if test "x$(GS_SHARED_OBJS)" != x; then \
--		mkdir -p $(gssharedir); \
-+		mkdir -p $(DESTDIR)$(gssharedir); \
- 		for obj in $(GS_SHARED_OBJS); do \
--			$(INSTALL_PROGRAM) $$obj $(gssharedir)/; \
-+			$(INSTALL_PROGRAM) $$obj $(DESTDIR)$(gssharedir)/; \
- 		done; \
- 	fi
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-ps2epsi-esp.diff b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-ps2epsi-esp.diff
deleted file mode 100644
index 58b7297b501a..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1_p20060430-ps2epsi-esp.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/ps2epsi.orig	2006-04-30 08:11:51.000000000 +0200
-+++ lib/ps2epsi	2006-04-30 08:13:11.000000000 +0200
-@@ -6,11 +6,6 @@
- fi
- 
- tmpfile=`mktemp ${TMPDIR-/tmp}/ps2epsi.XXXXXX`
--rm -f $tmpfile
--if test -e $tmpfile; then
--	echo "$0: Our temporary file $tmpfile already exists." 1>&2
--	exit 1
--fi
- trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
- 
- export outfile
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-big-cmap-post.patch b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-big-cmap-post.patch
deleted file mode 100644
index c6b6db6965c6..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-big-cmap-post.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2005-09-22 22:31:58.000000000 +0100
-+++ espgs-8.15.2/lib/gs_ttf.ps	2006-04-25 16:49:58.000000000 +0100
-@@ -261,6 +261,54 @@
-   } for pop exch pop
- } bind def
- 
-+/.biglength { % <str>|<array of str> .biglength <integer>
-+  dup type /arraytype eq { 0 exch { length add } forall } { length } ifelse
-+} bind def
-+
-+/concats { % [str ...] concats str
-+  () exch dup length 1 sub -1 0 {
-+    1 index exch get dup type /stringtype ne { dup length string cvs } if
-+    3 -1 roll exch dup length 2 index length add string
-+    dup dup 4 2 roll copy length 4 -1 roll putinterval exch
-+  } for pop
-+} bind def
-+
-+% <str>|<array of str> <index> <count> .biggetinterval <str>|<array of str>
-+/.biggetinterval {
-+  3 dict begin
-+  2 index type /arraytype eq {
-+    /c exch def
-+    /i exch def
-+    [ exch {
-+      dup length /l exch def
-+      i c add l gt {
-+        i l lt {
-+          i l i sub getinterval
-+          /c i c add l sub def
-+          /i 0 def
-+        } {
-+          pop
-+          /i i l sub def
-+        } ifelse
-+      } {
-+        i c getinterval exit
-+      } ifelse
-+    } forall
-+    ] dup .biglength 65535 le { concats } if
-+  } { getinterval } ifelse
-+  end
-+} bind def
-+
-+% <str>|<array of str> <index> getu16 <integer>
-+/.biggetu16 {
-+  2 .biggetinterval 0 getu16
-+} bind def
-+
-+% <str>|<array of str> <index> getu32 <integer>
-+/.biggetu32 {
-+  4 .biggetinterval 0 getu32
-+} bind def
-+
- % Each procedure in this dictionary is called as follows:
- %       <encodingtable> proc <glypharray>
- /cmapformats mark
-@@ -351,14 +399,14 @@
-   } bind
-   4 {		% Microsoft/Adobe segmented mapping.
-     /etab exch def
--    /nseg2 etab 6 getu16 def
--    14 /endc etab 2 index nseg2 getinterval def
-+    /nseg2 etab 6 .biggetu16 def
-+    14 /endc etab 2 index nseg2 .biggetinterval def
- 		% The Apple TrueType documentation omits the 2-byte
- 		% 'reserved pad' that follows the endCount vector!
-     2 add
--    nseg2 add /startc etab 2 index nseg2 getinterval def
--    nseg2 add /iddelta etab 2 index nseg2 getinterval def
--    nseg2 add /idroff etab 2 index nseg2 getinterval def
-+    nseg2 add /startc etab 2 index nseg2 .biggetinterval def
-+    nseg2 add /iddelta etab 2 index nseg2 .biggetinterval def
-+    nseg2 add /idroff etab 2 index nseg2 .biggetinterval def
- 		% The following hack allows us to properly handle
- 		% idiosyncratic fonts that start at 0xf000:
-     pop
-@@ -370,8 +418,8 @@
-     /numcodes 0 def /glyphs 0 0 2 nseg2 3 sub {
- 		% Stack: /glyphs numglyphs i2
-       /i2 exch def
--      /scode startc i2 getu16 def
--      /ecode endc i2 getu16 def
-+      /scode startc i2 .biggetu16 def
-+      /ecode endc i2 .biggetu16 def
-       numcodes scode firstcode sub
- 		% Hack for fonts that have only 0x0000 and 0xf000 ranges
-       %dup 16#e000 ge { 255 and } if
-@@ -392,8 +440,8 @@
-     /numcodes 0 def /code 0 def
-     0 2 nseg2 3 sub {
-       /i2 exch def
--      /scode startc i2 getu16 def
--      /ecode endc i2 getu16 def
-+      /scode startc i2 .biggetu16 def
-+      /ecode endc i2 .biggetu16 def
-       numcodes scode firstcode sub
- 		% Hack for fonts that have only 0x0000 and 0xf000 ranges
-       %dup 16#e000 ge { 255 and } if
-@@ -405,15 +453,15 @@
- 	(scode=) print scode =only
- 	( ecode=) print ecode =only
- 	( delta=) print delta =only
--	( droff=) print idroff i2 getu16 =
-+	( droff=) print idroff i2 .biggetu16 =
-       } if
--      idroff i2 getu16 dup 0 eq {
-+      idroff i2 .biggetu16 dup 0 eq {
- 	pop scode delta add 65535 and 1 ecode delta add 65535 and
- 	{ putglyph } for
-       } {	% The +2 is for the 'reserved pad'.
-         /gloff exch 14 nseg2 3 mul add 2 add i2 add add def
-         0 1 ecode scode sub {
--	  2 mul gloff add etab exch getu16
-+	  2 mul gloff add etab exch .biggetu16
- 	  dup 0 ne { delta add 65535 and } if putglyph
- 	} for
-       } ifelse
-@@ -436,12 +484,12 @@
- 
- % <cmaptab> cmaparray <glypharray>
- /cmaparray {
--  dup 0 getu16 cmapformats exch .knownget {
-+  dup 0 .biggetu16 cmapformats exch .knownget {
-     TTFDEBUG {
--      (cmap: format ) print 1 index 0 getu16 = flush
-+      (cmap: format ) print 1 index 0 .biggetu16 = flush
-     } if exec
-   } {
--    (Can't handle format ) print 0 getu16 = flush
-+    (Can't handle format ) print 0 .biggetu16 = flush
-     0 1 255 { } for 256 packedarray
-   } ifelse
-   TTFDEBUG {
-@@ -513,13 +561,13 @@
- % Adobe requirement that each sfnts entry have even length.
- /readtables mark
- 	% Ordinary tables
--  (cmap) { .readtable }
-+  (cmap) { .readbigtable }
-   (head) 1 index
-   (hhea) 1 index
-   (maxp) 1 index
-   (name) 1 index
-   (OS/2) 1 index
--  (post) 1 index
-+  (post) { .readbigtable }
-   %(vhea) 1 index
-   systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
-   (vhea) 1 index  % better to be ignored for vertical writing in pdfwrite
-@@ -867,10 +915,17 @@
-   } ifelse
- 		% Stack: ... /FontInfo mark key1 value1 ...
-   post null ne {
--    /ItalicAngle post 4 gets32 65536.0 div
--    /isFixedPitch post 12 getu32 0 ne
--    /UnderlinePosition post 8 gets16 upem div
--    /UnderlineThickness post 10 gets16 upem div
-+    post type /arraytype eq {
-+      % this post table is a big table. /post should be [(...) ...]
-+      % data we actually need here should be first one in array.
-+      /posttable post 1 get def
-+    } {
-+      /posttable post def
-+    } ifelse
-+    /ItalicAngle posttable 4 gets32 65536.0 div
-+    /isFixedPitch posttable 12 getu32 0 ne
-+    /UnderlinePosition posttable 8 gets16 upem div
-+    /UnderlineThickness posttable 10 gets16 upem div
-   } if
-   counttomark 0 ne { .dicttomark } { pop pop } ifelse
-   /XUID [orgXUID 42 curxuid]
-@@ -929,22 +984,22 @@
-     } if
-     tabdict /cmap get                                   % bool [] i PlatID SpecID (cmap)
-     dup /cmaptab exch def % temporary
--    0 1 2 index 2 getu16 1 sub {                         % bool [] i PlatID SpecID (cmap) j
--      8 mul 4 add 1 index exch 8 getinterval             % bool [] i PlatID SpecID (cmap) (cmapsub)
-+    0 1 2 index 2 .biggetu16 1 sub {                         % bool [] i PlatID SpecID (cmap) j
-+      8 mul 4 add 1 index exch 8 .biggetinterval             % bool [] i PlatID SpecID (cmap) (cmapsub)
-       TTFDEBUG {
--        (cmap: platform ) print dup 0 getu16 =only
--        ( encoding ) print dup 2 getu16 = flush
-+        (cmap: platform ) print dup 0 .biggetu16 =only
-+        ( encoding ) print dup 2 .biggetu16 = flush
-       } if
--      dup 0 getu16 4 index eq {
--        dup 2 getu16 3 index eq {                        % bool [] i PlatID SpecID (cmap) (cmapsub)
-+      dup 0 .biggetu16 4 index eq {
-+        dup 2 .biggetu16 3 index eq {                        % bool [] i PlatID SpecID (cmap) (cmapsub)
-           TTFDEBUG {
-             (Choosen a cmap for platform=) print 3 index =only
-             ( encoding=) print 2 index =
-           } if
-           /cmapsub 1 index def
--          dup 4 getu32                                   % bool [] i PlatID SpecID (cmap) (cmapsub) p
--          cmaptab length 1 index sub                     % bool [] i PlatID SpecID (cmap) (cmapsub) p l
--          cmaptab 3 1 roll getinterval
-+          dup 4 .biggetu32                                   % bool [] i PlatID SpecID (cmap) (cmapsub) p
-+          cmaptab .biglength 1 index sub                     % bool [] i PlatID SpecID (cmap) (cmapsub) p l
-+          cmaptab 3 1 roll .biggetinterval
-           /cmaptab exch def                              % bool [] i PlatID SpecID (cmap) (cmapsub)
-           5 index 5 index 1 add get                      % bool [] i PlatID SpecID (cmap) (cmapsub) /Decoding
-           /Decoding exch def                             % bool [] i PlatID SpecID (cmap) (cmapsub)
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-cups-1.1.patch b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-cups-1.1.patch
deleted file mode 100644
index 2bc89778a51f..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-cups-1.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: pstoraster/gdevcups.c
-===================================================================
---- pstoraster/gdevcups.c	(revision 163)
-+++ pstoraster/gdevcups.c	(working copy)
-@@ -3722,7 +3722,11 @@
-   * to separate each chunked color as needed...
-   */
- 
-+#ifdef CUPS_RASTER_SYNCv1
-   bandbytes = cups->header.cupsBytesPerLine / cups->header.cupsNumColors;
-+#else
-+  bandbytes = (cups->header.cupsWidth * cups->header.cupsBitsPerColor + 7) / 8;
-+#endif /* CUPS_RASTER_SYNCv1 */
- 
-   for (y = 0; y < cups->height; y ++)
-   {
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-destdir.diff b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-destdir.diff
deleted file mode 100644
index 39fab499e17e..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-destdir.diff
+++ /dev/null
@@ -1,324 +0,0 @@
-diff -urN espgs-8.15.1.orig/addons/addons.mak espgs-8.15.1/addons/addons.mak
---- espgs-8.15.1.orig/addons/addons.mak	2005-08-16 10:07:21.000000000 +0000
-+++ espgs-8.15.1/addons/addons.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -953,9 +953,9 @@
- 	$(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
- 
- extra-dmprt-install:
--	$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
--	$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
--	$(INSTALL_DATA) $(JAPSRC)escp_24.src $(install_prefix)$(gsdatadir)$(D)lib || exit 1
-+	$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
-+	$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
-+	$(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
- 
- 
- 
-@@ -1095,7 +1095,7 @@
- 
- extra-upp-install:
- 	for f in $(ADSRC)uniprint$(D)*.upp; do \
--	    $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)$(D)lib || exit 1; \
-+	    $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
- 	done
- 
- ### ------------ Build/Install special features ------------ ###
-diff -urN espgs-8.15.1.orig/pstoraster/cups.mak espgs-8.15.1/pstoraster/cups.mak
---- espgs-8.15.1.orig/pstoraster/cups.mak	2005-02-21 16:17:00.000000000 +0000
-+++ espgs-8.15.1/pstoraster/cups.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -24,9 +24,9 @@
- 
- cups_=	$(GLOBJ)gdevcups.$(OBJ)
- 
--CUPSSERVER= $(install_prefix)`cups-config --serverbin`
--CUPSCONFIG= $(install_prefix)`cups-config --serverroot`
--CUPSDATA= $(install_prefix)`cups-config --datadir`
-+CUPSSERVER= $(DESTDIR)`cups-config --serverbin`
-+CUPSCONFIG= $(DESTDIR)`cups-config --serverroot`
-+CUPSDATA= $(DESTDIR)`cups-config --datadir`
- 
- $(DD)cups.dev:	$(cups_) $(GLD)page.dev
- 	$(ADDMOD) $(DD)cups -lib cupsimage -lib cups
-diff -urN espgs-8.15.1.orig/src/all-arch.mak espgs-8.15.1/src/all-arch.mak
---- espgs-8.15.1.orig/src/all-arch.mak	2005-01-23 03:49:47.000000000 +0000
-+++ espgs-8.15.1/src/all-arch.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -298,24 +298,24 @@
- # Remove the old gs binary first, so as to preserve the previous
- # gs-x.yy version, if any.
- install-binary:
--	-$(RM) $(BINDIR)/$(GS)
-+	-$(RM) $(DESTDIR)$(BINDIR)/$(GS)
- 	@$(MAKE) $(ARGS) install GS=$(GS) XLIBDIRS=$(XLIBDIRSALL) ; \
- 	d=`pwd` ; \
- 	d=`basename $$d` ; \
- 	d=`echo $$d | sed -e s/gs/gs-/` ; \
--	$(RM) $(BINDIR)/$$d ; \
--	ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
--	ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
-+	$(RM) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d
- 
- install-binary-gnu-readline:
--	-$(RM) $(BINDIR)/$(GS)
-+	-$(RM) $(DESTDIR)$(BINDIR)/$(GS)
- 	@$(MAKE) $(ARGS) install GS=$(GS)  XLIBDIRS=$(XLIBDIRSALL) $(GNU_READLINE_ARGS) ; \
- 	d=`pwd` ; \
- 	d=`basename $$d` ; \
- 	d=`echo $$d | sed -e s/gs/gs-/` ; \
--	$(RM) $(BINDIR)/$$d ; \
--	ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
--	ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
-+	$(RM) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \
-+	ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d
- 
- install-fontmap:
- 	@d=`pwd` ; \
-@@ -323,14 +323,14 @@
- 	d=`echo $$d | sed -e s/gs//` ; \
- 	if test -f $(GS_SRC_DIR)/Fontmap.new ; \
- 	then \
--		if test -f $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
-+		if test -f $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
- 		then \
- 			true ; \
- 		else \
--			mv $(GS_SHARE_DIR)/$$d/lib/Fontmap $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
-+			mv $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
- 		fi ; \
--		$(CP) $(GS_SRC_DIR)/Fontmap.new $(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
--		ls -l $(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
-+		$(CP) $(GS_SRC_DIR)/Fontmap.new $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
-+		ls -l $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
- 	fi
- 
- install-pdfsec:
-@@ -339,9 +339,9 @@
- 	d=`echo $$d | sed -e s/gs//` ; \
- 	if test -f $(GS_SRC_DIR)/lib/pdf_sec.ps ; \
- 	then \
--		$(MV) $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
--		$(CP) lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
--		$(CHMOD) 664 $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
-+		$(MV) $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
-+		$(CP) lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
-+		$(CHMOD) 664 $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
- 	fi
- 
- #=======================================================================
-diff -urN espgs-8.15.1.orig/src/macos-fw.mak espgs-8.15.1/src/macos-fw.mak
---- espgs-8.15.1.orig/src/macos-fw.mak	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15.1/src/macos-fw.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -103,19 +103,19 @@
- 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
- 
- install-so: so
--	-mkdir $(prefix)
--	-mkdir $(datadir)
--	-mkdir $(gsdir)
--	-mkdir $(gsdatadir)
--	-mkdir $(bindir)
--	-mkdir $(libdir)
--	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
--	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
--	$(RM_) $(libdir)/$(GS_SONAME)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
--	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+	-mkdir $(DESTDIR)$(prefix)
-+	-mkdir $(DESTDIR)$(datadir)
-+	-mkdir $(DESTDIR)$(gsdir)
-+	-mkdir $(DESTDIR)$(gsdatadir)
-+	-mkdir $(DESTDIR)$(bindir)
-+	-mkdir $(DESTDIR)$(libdir)
-+	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
-+	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
-+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
- 
- soinstall: install-so install-scripts install-data
- 
-@@ -144,8 +144,8 @@
- 	cp -r doc $(GS_FRAMEWORK)/Versions/Current
- 
- framework_install : framework
--	rm -rf $(prefix)
--	cp -r $(GS_FRAMEWORK) $(prefix)
-+	rm -rf $(DESTDIR)$(prefix)
-+	cp -r $(GS_FRAMEWORK) $(DESTDIR)$(prefix)
- 
- # Make the build directories
- SODIRS: STDDIRS
-diff -urN espgs-8.15.1.orig/src/unix-dll.mak.in espgs-8.15.1/src/unix-dll.mak.in
---- espgs-8.15.1.orig/src/unix-dll.mak.in	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15.1/src/unix-dll.mak.in	2005-11-03 11:57:30.000000000 +0000
-@@ -96,19 +96,19 @@
- 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
- 
- install-so: so
--	-mkdir -p $(prefix)
--	-mkdir -p $(datadir)
--	-mkdir -p $(gsdir)
--	-mkdir -p $(gsdatadir)
--	-mkdir -p $(bindir)
--	-mkdir -p $(libdir)
--	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
--	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
--	$(RM_) $(libdir)/$(GS_SONAME)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
--	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+	-mkdir -p $(DESTDIR)$(prefix)
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(bindir)
-+	-mkdir -p $(DESTDIR)$(libdir)
-+	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
-+	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
-+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
- 
- soinstall: install-so install-scripts install-data
- 
-diff -urN espgs-8.15.1.orig/src/unixinst.mak espgs-8.15.1/src/unixinst.mak
---- espgs-8.15.1.orig/src/unixinst.mak	2005-09-22 17:03:45.000000000 +0000
-+++ espgs-8.15.1/src/unixinst.mak	2005-11-03 11:57:30.000000000 +0000
-@@ -28,24 +28,24 @@
- # rules, just in case bindir or scriptdir is a subdirectory of any of these.
- 
- install-exec: STDDIRS $(GS_XE)
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)
--	-mkdir -p $(bindir)
--	$(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(bindir)
-+	$(INSTALL_PROGRAM) $(GS_XE) $(DESTDIR)$(bindir)/$(GS)
- 
- install-scripts: $(PSLIBDIR)/gsnd
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)
--	-mkdir -p $(scriptdir)
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(scriptdir)
- 	$(SH) -c 'for f in \
- gsbj gsdj gsdj500 gslj gslp gsnd \
- bdftops dumphints dvipdf eps2eps font2c \
- pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
- ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps wftopfa \
- fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
--	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(scriptdir); fi;\
-+	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(DESTDIR)$(scriptdir); fi;\
- 	done'
- 
- PSRESDIR=$(PSLIBDIR)/../Resource
-@@ -59,10 +59,10 @@
- # one file from each subdirectory just as a sanity check.
- 
- install-libdata: 
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)
--	-mkdir -p $(install_prefix)$(gsdatadir)/lib
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)/lib
- 	$(SH) -c 'for f in \
- Fontmap Fontmap.GS cidfmap \
- FAPIcidfmap FAPIconfig FAPIfontmap xlatmap \
-@@ -80,24 +80,24 @@
- winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \
- pdf2dsc.ps pdfopt.ps \
- dmp_init.ps dmp_site.ps gdevmjc.ps escp_24.src ;\
--	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(install_prefix)$(gsdatadir)/lib; fi;\
-+	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(DESTDIR)$(gsdatadir)/lib; fi;\
- 	done'
- 	$(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\
--	do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib ;\
-+	do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
- 	done'
- 	$(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
--	do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib ;\
-+	do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
- 	done'
- 
- # install the default resource files
- # copy in every category (directory) but CVS
- RES_CATEGORIES=`ls $(PSRESDIR) | grep -v CVS` 
- install-resdata: $(PSRESDIR)/Decoding/Unicode
--	-mkdir -p $(datadir)
--	-mkdir -p $(install_prefix)$(gsdir)
--	-mkdir -p $(install_prefix)$(gsdatadir)/Resource
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)/Resource
- 	$(SH) -c 'for dir in $(RES_CATEGORIES); do \
--	  rdir=$(install_prefix)$(gsdatadir)/Resource/$$dir ; \
-+	  rdir=$(DESTDIR)$(gsdatadir)/Resource/$$dir ; \
- 	  test -d $$rdir || mkdir -p $$rdir ; \
- 	  for file in $(PSRESDIR)/$$dir/*; do \
- 	    if test -f $$file; then $(INSTALL_DATA) $$file $$rdir ; fi \
-@@ -118,9 +118,9 @@
- 	   Psfiles.htm Public.htm Readme.htm Release.htm \
- 	   Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
- install-doc: $(PSDOCDIR)/News.htm
--	-mkdir -p $(install_prefix)$(docdir)
-+	-mkdir -p $(DESTDIR)$(docdir)
- 	$(SH) -c 'for f in $(DOC_PAGES) ;\
--	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(install_prefix)$(docdir); fi;\
-+	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(DESTDIR)$(docdir); fi;\
- 	done'
- 
- # install the man pages for each locale
-@@ -129,9 +129,9 @@
- MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
- MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
- install-man: $(PSMANDIR)/gs.1
--	$(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
-+	$(SH) -c 'test -d $(DESTDIR)$(mandir) || mkdir -p $(DESTDIR)$(mandir)'
- 	$(SH) -c 'for d in $(MAN_LCDIRS) ;\
--	do man1dir=$(mandir)/$$d/man$(man1ext) ;\
-+	do man1dir=$(DESTDIR)$(mandir)/$$d/man$(man1ext) ;\
- 	  ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
- 	  for f in $(PSMANDIR)/$$d/*.1 ;\
- 	    do $(INSTALL_DATA) $$f $$man1dir ;\
-@@ -158,18 +158,18 @@
- 
- # install the example files
- install-examples:
--	-mkdir -p $(install_prefix)$(exdir)
-+	-mkdir -p $(DESTDIR)$(exdir)
- 	for f in \
- alphabet.ps colorcir.ps doretree.ps escher.ps \
- golfer.eps grayalph.ps snowflak.ps tiger.eps vasarely.ps waterfal.ps \
- ridt91.eps ;\
--	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(install_prefix)$(exdir) ;\
-+	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(DESTDIR)$(exdir) ;\
- 	done
- 
- install-shared: $(GS_SHARED_OBJS)
- 	if test "x$(GS_SHARED_OBJS)" != x; then \
--		mkdir -p $(gssharedir); \
-+		mkdir -p $(DESTDIR)$(gssharedir); \
- 		for obj in $(GS_SHARED_OBJS); do \
--			$(INSTALL_PROGRAM) $$obj $(gssharedir)/; \
-+			$(INSTALL_PROGRAM) $$obj $(DESTDIR)$(gssharedir)/; \
- 		done; \
- 	fi
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-gtk-configure.patch b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-gtk-configure.patch
deleted file mode 100644
index c3660486007d..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-gtk-configure.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -u espgs-8.15.2_p9999/src/unix-dll.mak.in /files/unix-dll.mak.in
---- espgs-8.15.2_p9999/src/unix-dll.mak.in	2006-05-20 09:59:44.000000000 +0200
-+++ /files/unix-dll.mak.in	2006-05-20 09:57:14.000000000 +0200
-@@ -67,6 +67,7 @@
- # Build the small Ghostscript loaders, with Gtk+ and without
- 
- @BUILD_GTK_LOADER@
-+@BUILD_GTK_LOADER2@
- 
- $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
- 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
-@@ -102,7 +103,7 @@
- 	-mkdir -p $(DESTDIR)$(bindir)
- 	-mkdir -p $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
-+	@if test -e $(GSSOX); then $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME); fi
- 	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
- 	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
- 	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
-diff -u espgs-8.15.2_p9999/src/configure.ac /files/configure.ac
---- espgs-8.15.2_p9999/src/configure.ac	2006-05-20 09:59:43.000000000 +0200
-+++ /files/configure.ac	2006-05-20 09:57:04.000000000 +0200
-@@ -192,8 +192,8 @@
- 		AC_MSG_CHECKING(for fontconfig)
- 		if $PKGCONFIG --exists fontconfig; then
- 			AC_MSG_RESULT(yes)
--			CFLAGS="$CFLAGS `$PKG_CONFIG --cflags fontconfig`"
--			FONTCONFIG_LIBS="`$PKG_CONFIG --libs fontconfig`"
-+			CFLAGS="$CFLAGS `$PKGCONFIG --cflags fontconfig`"
-+			FONTCONFIG_LIBS="`$PKGCONFIG --libs fontconfig`"
- 			AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1)
- 		else
- 			AC_MSG_RESULT(no)
-@@ -478,20 +478,29 @@
- dnl check if we can/should build the gtk loader
- AC_ARG_ENABLE([gtk], AC_HELP_STRING([--disable-gtk], [Don't build the gtk loader]))
- if test "x$enable_gtk" != "xno"; then
--	AC_MSG_CHECKING([for gtk])
--	if $with_gtk --cflags >/dev/null 2>/dev/null; then
--		AC_MSG_RESULT([yes])
--		BUILD_GTK_LOADER="\$(GSSOX_XE): \$(GS_SO) \$(GLSRC)dxmain.c
--	\$(GLCC) -g `gtk-config --cflags` -o \$(GSSOX_XE) \$(GLSRC)dxmain.c -L$(BINDIR) -l\$(GS) `gtk-config --libs`"
--		HAVE_GTK=yes
--	else
--		AC_MSG_RESULT([no])
-+	# We MUST NOT use PKG_CHECK_MODULES since it is a) not a standard
-+	# autoconf macro and b) requires pkg-config on the system, which is
-+	# NOT standard on ANY OS, including Linux!
-+	AC_PATH_PROG(PKGCONFIG, pkg-config, no)
-+
-+	if test "$PKGCONFIG" != no; then
-+		AC_MSG_CHECKING([for gtk])
-+		if $PKGCONFIG --exists gtk+-2.0; then
-+			AC_MSG_RESULT([yes])
-+		BUILD_GTK_LOADER='$(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c'
-+		BUILD_GTK_LOADER2="	\$(GLCC) -g `$PKGCONFIG gtk+-2.0 --cflags` -o \$(GSSOX_XE) \$(GLSRC)dxmain.c -L\$(BINDIR) -l\$(GS) `$PKGCONFIG gtk+-2.0 --libs`"
-+			HAVE_GTK=yes
-+		else
-+			AC_MSG_RESULT([no])
-+		fi
- 	fi
- fi
- if test "$HAVE_GTK" != "yes"; then
- 	BUILD_GTK_LOADER='$(GSSOX_XE): $(GSSOC_XE)'
-+	BUILD_GTK_LOADER2=''
- fi
- AC_SUBST(BUILD_GTK_LOADER)
-+AC_SUBST(BUILD_GTK_LOADER2)
- 
- dnl look for omni implementation
- AC_ARG_WITH([omni], AC_HELP_STRING([--with-omni],
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-noopt.patch b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-noopt.patch
deleted file mode 100644
index 4b33c7551f6f..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.2-noopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ghostscript-7.07/src/int.mak.noopt	2005-03-10 17:22:53.000000000 +0000
-+++ ghostscript-7.07/src/int.mak.in	2005-03-10 17:24:10.000000000 +0000
-@@ -105,7 +105,7 @@
- $(PSOBJ)igcref.$(OBJ) : $(PSSRC)igcref.c $(GH) $(memory__h)\
-  $(gsexit_h) $(gsstruct_h)\
-  $(iastate_h) $(idebug_h) $(igc_h) $(iname_h) $(ipacked_h) $(store_h)
--	$(PSCC) $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c
-+	$(PSCC) -O0 $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c
- 
- $(PSOBJ)igcstr.$(OBJ) : $(PSSRC)igcstr.c $(GH) $(memory__h)\
-  $(gsmdebug_h) $(gsstruct_h) $(iastate_h) $(igcstr_h)
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-fontconfig.patch b/app-text/ghostscript-esp/files/ghostscript-esp-fontconfig.patch
deleted file mode 100644
index 694dc1328055..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-esp-fontconfig.patch
+++ /dev/null
@@ -1,239 +0,0 @@
---- espgs-8.15.1/src/configure.ac.orig	2006-04-29 13:59:03.000000000 +0200
-+++ espgs-8.15.1/src/configure.ac	2006-04-29 13:59:08.000000000 +0200
-@@ -173,6 +173,13 @@
- fi
- 
- 
-+PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [have_fontconfig=yes], [have_fontconfig=no])
-+if test "x$have_fontconfig" = "xyes"; then
-+       AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
-+fi
-+CFLAGS="$CFLAGS $FONTCONFIG_CFLAGS"
-+AC_SUBST(FONTCONFIG_LIBS)
-+
- dnl --------------------------------------------------
- dnl Check for libraries
- dnl --------------------------------------------------
---- espgs-8.15.1/src/gp_unix.c.orig	2006-04-29 13:59:03.000000000 +0200
-+++ espgs-8.15.1/src/gp_unix.c	2006-04-29 13:59:08.000000000 +0200
-@@ -23,6 +23,12 @@
- #include "gsexit.h"
- #include "gp.h"
- 
-+#define HAVE_FONTCONFIG
-+
-+#ifdef HAVE_FONTCONFIG
-+#include <fontconfig/fontconfig.h>
-+#endif
-+
- /*
-  * This is the only place in Ghostscript that calls 'exit'.  Including
-  * <stdlib.h> is overkill, but that's where it's declared on ANSI systems.
-@@ -220,16 +226,193 @@
-   * building a custom fontmap file.
-   */
-  
-+
-+/* Mangle the FontConfig family and style information into a
-+ * PostScript font name */
-+#ifdef HAVE_FONTCONFIG
-+static void makePSFontName(char* family, int weight, int slant, char *buf, int bufsize)
-+{
-+    int bytesCopied, length, i;
-+    const char *slantname, *weightname;
-+
-+    switch (slant) {
-+	case FC_SLANT_ROMAN:   slantname=""; break;;
-+	case FC_SLANT_OBLIQUE: slantname="Oblique"; break;;
-+	case FC_SLANT_ITALIC:  slantname="Italic"; break;;
-+	default:               slantname="Unknown"; break;;
-+    }
-+
-+    switch (weight) {
-+	case FC_WEIGHT_MEDIUM:   weightname=""; break;;
-+	case FC_WEIGHT_LIGHT:    weightname="Light"; break;;
-+	case FC_WEIGHT_DEMIBOLD: weightname="Demi"; break;;
-+	case FC_WEIGHT_BOLD:     weightname="Bold"; break;;
-+	case FC_WEIGHT_BLACK:    weightname="Black"; break;;
-+	default:                 weightname="Unknown"; break;;
-+    }
-+
-+    length = strlen(family);
-+    if (length >= bufsize)
-+	length = bufsize;
-+    /* Copy the family name, stripping spaces */
-+    bytesCopied=0;
-+    for (i = 0; i < length; i++)
-+	if (family[i] != ' ')
-+	    buf[bytesCopied++] = family[i];
-+
-+    if ( ((slant != FC_SLANT_ROMAN) || (weight != FC_WEIGHT_MEDIUM)) \
-+	    && bytesCopied < bufsize )
-+    {
-+	buf[bytesCopied] = '-';
-+	bytesCopied++;
-+	if (weight != FC_WEIGHT_MEDIUM)
-+	{
-+	    length = strlen(family);
-+	    if ((length + bytesCopied) >= bufsize)
-+		length = bufsize - bytesCopied - 1;
-+	    strncpy(buf+bytesCopied, weightname, length);
-+	    bytesCopied += length;
-+	}
-+	if (slant != FC_SLANT_ROMAN)
-+	{
-+	    length = strlen(family);
-+	    if ((length + bytesCopied) >= bufsize)
-+		length = bufsize - bytesCopied - 1;
-+	    strncpy(buf+bytesCopied, slantname, length);
-+	    bytesCopied += length;
-+	}
-+    }
-+    buf[bytesCopied] = '\0';
-+}
-+#endif
-+
-+/* State struct for font iteration - passed as an opaque 'void*' through the rest of gs */
-+#ifdef HAVE_FONTCONFIG
-+typedef struct {
-+    int index;              /* current index of iteration over font_list */
-+    FcConfig* fc;           /* FontConfig library handle */
-+    FcFontSet* font_list;   /* FontConfig font list */
-+    char name[255];         /* name of last font */
-+} unix_fontenum_t;
-+#endif
-+
- void *gp_enumerate_fonts_init(gs_memory_t *mem)
- {
-+#ifdef HAVE_FONTCONFIG
-+    unix_fontenum_t *state = (unix_fontenum_t *)malloc(sizeof(unix_fontenum_t));
-+    if (state == NULL)
-+	return NULL;    /* Failed to allocate state */
-+
-+    state->index     = 0;
-+    state->fc        = NULL;
-+    state->font_list = NULL;
-+
-+    /* Load the fontconfig library */
-+    state->fc = FcInitLoadConfigAndFonts();
-+    if (state->fc == NULL) {
-+	free(state);
-+	state = NULL;
-+	dlprintf("destroyed state - fontconfig init failed");
-+	return NULL;  /* Failed to open fontconfig library */
-+    }
-+
-+    /* load the font set that we'll iterate over */
-+    FcPattern *pat = FcPatternBuild(NULL,
-+	    FC_OUTLINE, FcTypeBool, 1,
-+	    FC_SCALABLE, FcTypeBool, 1,
-+	    NULL);
-+    FcObjectSet* os = FcObjectSetBuild(FC_FILE, FC_OUTLINE, FC_FAMILY, FC_WEIGHT, FC_SLANT, 0);
-+    state->font_list = FcFontList(0, pat, os);
-+    FcPatternDestroy(pat);
-+    FcObjectSetDestroy(os);
-+    if (state->font_list == NULL) {
-+	free(state);
-+	state = NULL;
-+	return NULL;  /* Failed to generate font list */
-+    }
-+    return (void *)state;
-+#else
-     return NULL;
-+#endif
- }
--         
-+
- int gp_enumerate_fonts_next(void *enum_state, char **fontname, char **path)
- {
-+#ifdef HAVE_FONTCONFIG
-+    char* psname = NULL;
-+
-+    unix_fontenum_t* state = (unix_fontenum_t *)enum_state;
-+    if (state == NULL) {
-+	return 0;   /* gp_enumerate_fonts_init failed for some reason */
-+    }
-+
-+    /* Bits of the following were borrowed from Red Hat's GS 7 FontConfig patch */
-+    FcChar8* file_fc = NULL;
-+    FcChar8* family_fc = NULL;
-+    int outline_fc, slant_fc, weight_fc;
-+    FcResult result;
-+
-+    if (state->index == state->font_list->nfont) {
-+	return 0; /* we've run out of fonts */
-+    }
-+
-+    FcPattern* font = state->font_list->fonts[state->index];
-+
-+    result = FcPatternGetString (font, FC_FAMILY, 0, &family_fc);
-+    if (result != FcResultMatch || family_fc == NULL) {
-+	dlprintf ("DEBUG: FC_FAMILY mismatch\n");
-+	return 0;
-+    }
-+
-+    result = FcPatternGetString (font, FC_FILE, 0, &file_fc);
-+    if (result != FcResultMatch || file_fc == NULL) {
-+	dlprintf ("DEBUG: FC_FILE mismatch\n");
-+	return 0;
-+    }
-+
-+    result = FcPatternGetBool (font, FC_OUTLINE, 0, &outline_fc);
-+    if (result != FcResultMatch) {
-+	dlprintf1 ("DEBUG: FC_OUTLINE failed to match on %s\n", (char*)family_fc);
-+	return 0;
-+    }
-+
-+    result = FcPatternGetInteger (font, FC_SLANT, 0, &slant_fc);
-+    if (result != FcResultMatch) {
-+	dlprintf ("DEBUG: FC_SLANT didn't match\n");
-+	return 0;
-+    }
-+
-+    result = FcPatternGetInteger (font, FC_WEIGHT, 0, &weight_fc);
-+    if (result != FcResultMatch) {
-+	dlprintf ("DEBUG: FC_WEIGHT didn't match\n");
-+	return 0;
-+    }
-+
-+    /* Gross hack to work around Fontconfig's inability to tell
-+     * us the font's PostScript name - generate it ourselves.
-+     * We must free the memory allocated here next time around. */
-+    makePSFontName((char *)family_fc, weight_fc, slant_fc, &state->name, sizeof(state->name));
-+    *fontname = &state->name;
-+
-+    /* return the font path straight out of fontconfig */
-+    *path = (char*)file_fc;
-+
-+    state->index ++;
-+    return 1;
-+#else
-     return 0;
-+#endif
- }
--                         
-+
- void gp_enumerate_fonts_free(void *enum_state)
- {
--}           
-+#ifdef HAVE_FONTCONFIG
-+    unix_fontenum_t* state = (unix_fontenum_t *)enum_state;
-+    if (state != NULL) {
-+	if (state->font_list != NULL)
-+	    FcFontSetDestroy(state->font_list);
-+	free(state);
-+    }
-+#endif
-+}
-+
---- espgs-8.15.1/src/Makefile.in.orig	2006-04-29 13:59:03.000000000 +0200
-+++ espgs-8.15.1/src/Makefile.in	2006-04-29 14:01:24.000000000 +0200
-@@ -263,7 +263,7 @@
- # Solaris may need -lnsl -lsocket -lposix4.
- # (Libraries required by individual drivers are handled automatically.)
- 
--EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@
-+EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
- 
- # Define the standard libraries to search at the end of linking.
- # Most platforms require -lpthread for the POSIX threads library;
diff --git a/app-text/ghostscript-esp/files/ghostscript-gtk2.patch b/app-text/ghostscript-esp/files/ghostscript-gtk2.patch
deleted file mode 100644
index 6a70be4c34d3..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-gtk2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- espgs-8.15rc3/src/unix-dll.mak.gtk2	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15rc3/src/unix-dll.mak	2005-06-03 12:31:56.000000000 +0100
-@@ -67,7 +67,7 @@
- # Build the small Ghostscript loaders, with Gtk+ and without
- 
- $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
--	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
-+	$(GLCC) -g `pkg-config gtk+-2.0 --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config gtk+-2.0 --libs`
- 
- $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
- 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
diff --git a/app-text/ghostscript-esp/files/ghostscript-noopt.patch b/app-text/ghostscript-esp/files/ghostscript-noopt.patch
deleted file mode 100644
index 3a93580e0346..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-noopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ghostscript-7.07/src/int.mak.noopt	2005-03-10 17:22:53.000000000 +0000
-+++ ghostscript-7.07/src/int.mak	2005-03-10 17:24:10.000000000 +0000
-@@ -105,7 +105,7 @@
- $(PSOBJ)igcref.$(OBJ) : $(PSSRC)igcref.c $(GH) $(memory__h)\
-  $(gsexit_h) $(gsstruct_h)\
-  $(iastate_h) $(idebug_h) $(igc_h) $(iname_h) $(ipacked_h) $(store_h)
--	$(PSCC) $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c
-+	$(PSCC) -O0 $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c
- 
- $(PSOBJ)igcstr.$(OBJ) : $(PSSRC)igcstr.c $(GH) $(memory__h)\
-  $(gsmdebug_h) $(gsstruct_h) $(iastate_h) $(igcstr_h)
diff --git a/app-text/ghostscript-esp/files/ghostscript-pagesize.patch b/app-text/ghostscript-esp/files/ghostscript-pagesize.patch
deleted file mode 100644
index 8e470760d168..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-pagesize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ghostscript-7.07/src/gdevpsu.c.pagesize	2004-06-25 17:31:43.054995862 +0100
-+++ ghostscript-7.07/src/gdevpsu.c	2004-06-25 17:33:07.500857781 +0100
-@@ -273,6 +273,9 @@
- 	while (p->size_name[0] == '/' &&
- 	       (p->width != width || p->height != height))
- 	    ++p;
-+	/* If no match then decrement pointer back to /letter */
-+	if (p->width == 0 && p->height == 0)
-+	    --p;
- 	pprintd2(s, "%d %d ", width, height);
- 	pprints1(s, "%s setpagesize\n", p->size_name);
-     }
diff --git a/app-text/ghostscript-esp/files/ghostscript-ps2epsi.patch b/app-text/ghostscript-esp/files/ghostscript-ps2epsi.patch
deleted file mode 100644
index fd000aaa11f0..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-ps2epsi.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- espgs-8.15rc3/lib/ps2epsi.ps2epsi	2005-06-02 18:13:37.000000000 +0100
-+++ espgs-8.15rc3/lib/ps2epsi	2005-06-03 10:47:10.000000000 +0100
-@@ -73,6 +73,7 @@
- BEGINEPS
- 
- cat "${infile}" |
-+LC_ALL=C \
- sed -e '/^%%BeginPreview:/,/^%%EndPreview[^!-\~]*$/d' -e '/^%!PS-Adobe/d' \
-     -e '/^%%[A-Za-z][A-Za-z]*[^!-\~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
- 
diff --git a/app-text/ghostscript-esp/files/ghostscript-scripts.patch b/app-text/ghostscript-esp/files/ghostscript-scripts.patch
deleted file mode 100644
index f4d9885acb4f..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-scripts.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- espgs-8.15rc3/lib/pv.sh.scripts	2005-01-19 04:08:41.000000000 +0000
-+++ espgs-8.15rc3/lib/pv.sh	2005-06-02 17:40:08.000000000 +0100
-@@ -26,12 +26,17 @@
- # the -D switch from the call of dvips below.
- #
- TEMPDIR=.
--PAGE=$1
-+PAGE="$1"
- shift
--FILE=$1
-+FILE="$1"
- shift
--trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
--#dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--gs $FILE.$$.pv
-+TEMPFILE=`mktemp "$TEMPDIR/$FILE.XXXXXX"`
-+if [ $? -ne 0 ]
-+then
-+  exit 1
-+fi
-+trap 'rm -f "$TEMPFILE"' 0 1 2 15
-+#dvips -R -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
-+dvips -R -p $PAGE -n 1 "$FILE" "$@" -o "$TEMPFILE"
-+gs "$TEMPFILE"
- exit 0
---- espgs-8.15rc3/lib/ps2epsi.scripts	2005-06-02 17:41:32.000000000 +0100
-+++ espgs-8.15rc3/lib/ps2epsi	2005-06-02 17:41:50.000000000 +0100
-@@ -5,7 +5,7 @@
- 	gs=gs
- fi
- 
--tmpfile=/tmp/ps2epsi$$
-+tmpfile=`mktemp ${TMPDIR-/tmp}/ps2epsi.XXXXXX`
- rm -f $tmpfile
- if test -e $tmpfile; then
- 	echo "$0: Our temporary file $tmpfile already exists." 1>&2
diff --git a/app-text/ghostscript-esp/files/ghostscript-split-font-configuration.patch b/app-text/ghostscript-esp/files/ghostscript-split-font-configuration.patch
deleted file mode 100644
index ab1c3b031bd8..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-split-font-configuration.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ruN espgs-8.15rc3.orig/lib/gs_fonts.ps espgs-8.15rc3/lib/gs_fonts.ps
---- espgs-8.15rc3.orig/lib/gs_fonts.ps	2005-02-17 06:21:49.000000000 +0900
-+++ espgs-8.15rc3/lib/gs_fonts.ps	2005-07-13 20:14:12.000000000 +0900
-@@ -96,10 +96,17 @@
-                 % stack: dict file fontname filename|aliasname
-       1 index type /stringtype eq
-       1 index type /nametype eq and 1 index xcheck and
--      1 index /run eq 2 index /.runlibfile eq or and {
-+      1 index /run eq 2 index /.runlibfile eq 3 index /.runlibfileifexists eq or or and {
-                 % This is an inclusion entry.
--        pop findlibfile { exch pop } { file } ifelse
--        2 index exch .readFontmap pop
-+        0 index /.runlibfileifexists eq {
-+          pop findlibfile {
-+            exch pop
-+            2 index exch .readFontmap pop
-+          } { pop } ifelse
-+        } {
-+          pop findlibfile { exch pop } { file } ifelse
-+          2 index exch .readFontmap pop
-+        } ifelse
-       } {
-                 % This is a real entry.
-                 % Read and pop tokens until a semicolon.
-diff -ruN espgs-8.15rc3.orig/lib/gs_init.ps espgs-8.15rc3/lib/gs_init.ps
---- espgs-8.15rc3.orig/lib/gs_init.ps.in	2005-07-12 11:04:36.000000000 +0900
-+++ espgs-8.15rc3/lib/gs_init.ps.in	2005-07-13 20:14:12.000000000 +0900
-@@ -655,6 +655,13 @@
- 	   { /undefinedfilename signalerror }
- 	  ifelse
- 	} bind def
-+/runlibfileifexists
-+	{
-+	  findlibfile
-+	   { exch pop /run .systemvar exec }
-+	   { pop }
-+	  ifelse
-+	} bind def
- /selectdevice
- 	{ finddevice setdevice .setdefaultscreen } bind def
- /signalerror		% <object> <errorname> signalerror -
-@@ -816,6 +823,7 @@
- 	} bind def
- % Temporarily substitute it for the real runlibfile.
- /.runlibfile /runlibfile load def
-+/.runlibfileifexists /runlibfileifexists load def
- /runlibfile /runlibfile0 load def
- 
- % Create the error handling machinery.
-@@ -1655,6 +1663,7 @@
- 
- % Restore the real definition of runlibfile.
- /runlibfile /.runlibfile load def
-+/runlibfileifexists /.runlibfileifexists load def
- currentdict /.runlibfile .undef
- 
- % Bind all the operators defined as procedures.
diff --git a/app-text/ghostscript-esp/files/ghostscript-use-external-freetype.patch b/app-text/ghostscript-esp/files/ghostscript-use-external-freetype.patch
deleted file mode 100644
index 2662b402fb41..000000000000
--- a/app-text/ghostscript-esp/files/ghostscript-use-external-freetype.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ruN espgs-8.15rc3.orig/src/fapi_ft.c espgs-8.15rc3/src/fapi_ft.c
---- espgs-8.15rc3.orig/src/fapi_ft.c	2005-01-19 13:08:41.000000000 +0900
-+++ espgs-8.15rc3/src/fapi_ft.c	2005-07-12 11:36:32.000000000 +0900
-@@ -30,11 +30,12 @@
- #include "math_.h"
- 
- /* FreeType headers */
--#include "freetype/freetype.h"
--#include "freetype/ftincrem.h"
--#include "freetype/ftglyph.h"
--#include "freetype/ftoutln.h"
--#include "freetype/fttrigon.h"
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_INCREMENTAL_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
- 
- #include <assert.h>
- 
-diff -ruN espgs-8.15rc3.orig/src/int.mak espgs-8.15rc3/src/int.mak
---- espgs-8.15rc3.orig/src/int.mak	2005-07-12 11:04:23.000000000 +0900
-+++ espgs-8.15rc3/src/int.mak	2005-07-12 11:38:09.000000000 +0900
-@@ -1873,43 +1873,35 @@
- # FreeType bridge :
- 
- FT_LIB=$(FT_ROOT)$(D)objs$(D)freetype214MT_D
--FT_INC=$(I_)$(FT_ROOT)$(D)include$(_I)
--
- wrfont_h=$(stdpre_h) $(PSSRC)wrfont.h
- write_t1_h=$(ifapi_h) $(PSSRC)write_t1.h
- write_t2_h=$(ifapi_h) $(PSSRC)write_t2.h
- 
- $(PSD)fapif1.dev : $(INT_MAK) $(ECHOGS_XE) \
-- $(FT_LIB)$(FT_LIB_EXT) \
-  $(PSOBJ)fapi_ft.$(OBJ) \
-  $(PSOBJ)write_t1.$(OBJ) $(PSOBJ)write_t2.$(OBJ) $(PSOBJ)wrfont.$(OBJ)
- 	$(SETMOD) $(PSD)fapif1 $(PSOBJ)fapi_ft.$(OBJ) $(PSOBJ)write_t1.$(OBJ)
- 	$(ADDMOD) $(PSD)fapif1 $(PSOBJ)write_t2.$(OBJ) $(PSOBJ)wrfont.$(OBJ)
- 	$(ADDMOD) $(PSD)fapif1 -plugin fapi_ft
--	$(ADDMOD) $(PSD)fapif1 -link $(FT_LIB)$(FT_LIB_EXT)
-+	$(ADDMOD) $(PSD)fapif1 -lib $(FT_LIB)
- 
- $(PSOBJ)fapi_ft.$(OBJ) : $(PSSRC)fapi_ft.c $(AK)\
-  $(stdio__h) $(math__h) $(ifapi_h)\
-- $(FT_ROOT)$(D)include$(D)freetype$(D)freetype.h\
-- $(FT_ROOT)$(D)include$(D)freetype$(D)ftincrem.h\
-- $(FT_ROOT)$(D)include$(D)freetype$(D)ftglyph.h\
-- $(FT_ROOT)$(D)include$(D)freetype$(D)ftoutln.h\
-- $(FT_ROOT)$(D)include$(D)freetype$(D)fttrigon.h\
-  $(write_t1_h) $(write_t2_h)
--	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)fapi_ft.$(OBJ) $(C_) $(PSSRC)fapi_ft.c
-+	$(PSCC) $(FT_CFLAGS) $(PSO_)fapi_ft.$(OBJ) $(C_) $(PSSRC)fapi_ft.c
- 
- $(PSOBJ)write_t1.$(OBJ) : $(PSSRC)write_t1.c $(AK)\
-  $(wrfont_h) $(write_t1_h) 
--	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t1.$(OBJ) $(C_) $(PSSRC)write_t1.c
-+	$(PSCC) $(FT_CFLAGS) $(PSO_)write_t1.$(OBJ) $(C_) $(PSSRC)write_t1.c
- 
- $(PSOBJ)write_t2.$(OBJ) : $(PSSRC)write_t2.c $(AK)\
-  $(wrfont_h) $(write_t2_h) $(stdio_h)
--	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t2.$(OBJ) $(C_) $(PSSRC)write_t2.c
-+	$(PSCC) $(FT_CFLAGS) $(PSO_)write_t2.$(OBJ) $(C_) $(PSSRC)write_t2.c
- 
- $(PSOBJ)wrfont.$(OBJ) : $(PSSRC)wrfont.c $(AK)\
-  $(wrfont_h) $(stdio_h)
--	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)wrfont.$(OBJ) $(C_) $(PSSRC)wrfont.c
-+	$(PSCC) $(FT_CFLAGS) $(PSO_)wrfont.$(OBJ) $(C_) $(PSSRC)wrfont.c
- 
- # stub for FreeType bridge :
- 
diff --git a/app-text/ghostscript-esp/files/gs7.05.6-tempfile.patch b/app-text/ghostscript-esp/files/gs7.05.6-tempfile.patch
deleted file mode 100644
index 1e6a4f58b5cc..000000000000
--- a/app-text/ghostscript-esp/files/gs7.05.6-tempfile.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- espgs-7.05.6/lib/pj-gs.sh.orig	2004-10-08 18:48:15.125586200 -0400
-+++ espgs-7.05.6/lib/pj-gs.sh	2004-10-08 18:51:29.086099720 -0400
-@@ -241,6 +241,7 @@
- 			then
- 				/usr/lib/lprcat $Nofilter $Nolabel $file PCL1 $user $dev
- 			else
-+				TEMPFILE=`mktemp -t pjXXXXXX` || exit 1
- 				type=`file $file | sed 's/^[^:]*..//'`
- 				case "$type" in
- 				postscript*)
-@@ -251,22 +252,22 @@
- #
- #					gs -q -sDEVICE=paintjet -r180 -sOutputFile=- -dDISKFONTS -dNOPAUSE - < $file 2>/tmp/sh$$
- 
--					gs -q -sDEVICE=paintjet -r180 -sOutputFile=/tmp/pj$$ -dDISKFONTS -dNOPAUSE - < $file 1>2
--					cat /tmp/pj$$
--					rm /tmp/pj$$
-+					gs -q -sDEVICE=paintjet -r180 -sOutputFile=$TEMPFILE -dDISKFONTS -dNOPAUSE - < $file 1>2
-+					cat $TEMPFILE
-+					rm $TEMPFILE
- 					needff=
- 					;;
--				*)	cat "$file" 2>/tmp/sh$$
-+				*)	cat "$file" 2>$TEMPFILE
- 					needff=1
- 					;;
- 				esac
- 
--				if [ -s /tmp/sh$$ ]
-+				if [ -s $TEMPFILE ]
- 				then
- #				    cat /tmp/sh$$	# output any errors
--				    cat /tmp/sh$$ 1>2	# output any errors
-+				    cat $TEMPFILE 1>2	# output any errors
- 				fi
--				rm -f /tmp/sh$$
-+				rm -f $TEMPFILE
- 				if [ $needff ]; then echo "\014\r\c"; fi
- 			fi
- 
---- espgs-7.05.6/lib/ps2epsi.orig	2004-10-08 22:16:37.194982760 -0400
-+++ espgs-7.05.6/lib/ps2epsi	2004-10-08 23:03:25.320082856 -0400
-@@ -1,7 +1,8 @@
- #!/bin/sh
- # $Id: gs7.05.6-tempfile.patch,v 1.1 2006/01/05 00:00:18 metalgod Exp $
- 
--tmpfile=/tmp/ps2epsi$$
-+tmpfile=`mktemp -t ps2epsiXXXXXX` || exit 1
-+trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
- 
- export outfile
- 
---- espgs-7.05.6/lib/pv.sh.orig	2004-10-08 18:52:13.227389224 -0400
-+++ espgs-7.05.6/lib/pv.sh	2004-10-08 18:53:05.459448744 -0400
-@@ -27,11 +27,12 @@
- #
- TEMPDIR=.
- PAGE=$1
-+TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1
- shift
- FILE=$1
- shift
--trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
-+trap "rm -rf $TEMPFILE" 0 1 2 15
- #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--gs $FILE.$$.pv
-+dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
-+gs $TEMPFILE
- exit 0
---- espgs-7.05.6/lib/sysvlp.sh.orig	2004-10-08 18:53:10.521679168 -0400
-+++ espgs-7.05.6/lib/sysvlp.sh	2004-10-08 18:54:10.512559168 -0400
-@@ -27,20 +27,23 @@
- # Brother HL-4: switch to HP laserjet II+ emulation
- # echo "\033\015H\c"
- 
-+TEMPDIR=`mktemp -td sysvlp.XXXXXX` || exit 1
-+
- i=1
- while [ $i -le $copies ]
- do
- 	for file in $files
- 	do
- 		$GSHOME/gs \
--			-sOUTPUTFILE=/tmp/psp$$.%02d \
-+			-sOUTPUTFILE=$TEMPDIR/psp$$.%02d \
- 			-sDEVICE=$DEVICE \
- 			$EHANDLER $file \
- 			< /dev/null >> /usr/tmp/ps_log 2>&1
- 
--		cat /tmp/psp$$.* 2>> /usr/tmp/ps_log
--		rm -f /tmp/psp$$.*
-+		cat $TEMPDIR/psp$$.* 2>> /usr/tmp/ps_log
-+		rm -f $TEMPDIR/psp$$.*
- 	done
- 	i=`expr $i + 1`
- done
-+rmdir $TEMPDIR
- exit 0
diff --git a/app-text/ghostscript-esp/files/gs7.07.1-cjk.diff b/app-text/ghostscript-esp/files/gs7.07.1-cjk.diff
deleted file mode 100644
index d1a5d93638b9..000000000000
--- a/app-text/ghostscript-esp/files/gs7.07.1-cjk.diff
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -urN espgs-7.07.1/lib/CIDFnmap espgs-7.07.1.patched/lib/CIDFnmap
---- espgs-7.07.1/lib/CIDFnmap	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.07.1.patched/lib/CIDFnmap	2005-04-23 22:27:11.000000000 +0900
-@@ -135,14 +135,14 @@
- % in particular, you must leave at least one space or tab between each
- % field in the entry.  
- 
--%(CIDFnmap.Ore) .runlibfile
--%(CIDFnmap.ARP) .runlibfile
--%(CIDFnmap.Bae) .runlibfile
--%(CIDFnmap.Koc) .runlibfile
-+(CIDFnmap.Ore) .runlibfile
-+(CIDFnmap.ARP) .runlibfile
-+(CIDFnmap.Bae) .runlibfile
-+(CIDFnmap.Koc) .runlibfile
- %(CIDFnmap.Sol) .runlibfile
- %(CIDFnmap.Win) .runlibfile
- 
--%(CIDFnmap.CJK) .runlibfile
-+(CIDFnmap.CJK) .runlibfile
- 
- % native CIDFontName (BIG5) in traditional Chinese
- %(CIDFnmap.b5) .runlibfile
-diff -urN espgs-7.07.1/lib/CIDFnmap.CJK espgs-7.07.1.patched/lib/CIDFnmap.CJK
---- espgs-7.07.1/lib/CIDFnmap.CJK	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.07.1.patched/lib/CIDFnmap.CJK	2005-04-23 22:28:56.000000000 +0900
-@@ -24,51 +24,51 @@
- % Fallback aliases for CJK PDF files
- %
- %/Adobe-CNS1		/MOESung-Regular	; % CIDFnmap.Ore
--%/Adobe-CNS1		/ShanHeiSun-Light	; % CIDFnmap.ARP
-+/Adobe-CNS1		/ShanHeiSun-Light	; % CIDFnmap.ARP
- %/Adobe-CNS1		/ming			; % CIDFnmap.Sol
- %/Adobe-CNS1		/MingLiU		; % CIDFnmap.Win
- %/Adobe-CNS1		/SimSun-18030-Adobe-CNS1	; % CIDFnmap.Win
- 
--%/Adobe-GB1		/BousungEG-Light-GB	; % CIDFnmap.ARP
-+/Adobe-GB1		/BousungEG-Light-GB	; % CIDFnmap.ARP
- %/Adobe-GB1		/zycjksun		; % CIDFnmap.Sol
- %/Adobe-GB1		/SimSun			; % CIDFnmap.Win
- 
- %/Adobe-Japan1		/WadaMin-Regular	; % CIDFnmap.Ore
- %/Adobe-Japan1		/HG-MinchoL		; % CIDFnmap.Sol
--%/Adobe-Japan1		/Kochi-Mincho		; % CIDFnmap.Koc
-+/Adobe-Japan1		/Kochi-Mincho		; % CIDFnmap.Koc
- %/Adobe-Japan1		/MS-Mincho		; % CIDFnmap.Win
- 
--%/Adobe-Japan2		/WadaMin-RegularH	; % CIDFnmap.Ore
-+/Adobe-Japan2		/WadaMin-RegularH	; % CIDFnmap.Ore
- %/Adobe-Japan2		/HeiseiMin-W3H		; % CIDFnmap.Sol
- %/Adobe-Japan2		/MS-Mincho-Adobe-Japan2		; % CIDFnmap.Win
- 
- %/Adobe-Korea1		/Munhwa-Regular		; % CIDFnmap.Ore
--%/Adobe-Korea1		/Baekmuk-Batang		; % CIDFnmap.Bae
-+/Adobe-Korea1		/Baekmuk-Batang		; % CIDFnmap.Bae
- %/Adobe-Korea1		/Myeongjo		; % CIDFnmap.Sol
- %/Adobe-Korea1		/Batang			; % CIDFnmap.Win
- 
- %
- % Convenient aliases for PS files on Traditional Chinese PostScript printer
- %
--%/MSung-Light		/MOESung-Regular	; % CIDFnmap.Ore
-+/MSung-Light		/MOESung-Regular	; % CIDFnmap.Ore
- %/MSung-Light		/SimSun-18030-Adobe-CNS1	; % CIDFnmap.Win
--%/MSung-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
--%/MHei-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
-+/MSung-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
-+/MHei-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
- %/MHei-Medium		/hei			; % CIDFnmap.Sol
--%/MKai-Medium		/ZenKai-Medium		; % CIDFnmap.ARP
-+/MKai-Medium		/ZenKai-Medium		; % CIDFnmap.ARP
- %/MKai-Medium		/kai			; % CIDFnmap.Sol
- 
- %
- % Convenient aliases for PS files on Simplified Chinese PostScript printer
- %
--%/STSong-Light		/BousungEG-Light-GB	; % CIDFnmap.ARP
-+/STSong-Light		/BousungEG-Light-GB	; % CIDFnmap.ARP
- %/STSong-Light		/zycjksun		; % CIDFnmap.Sol
- %/STSong-Light		/SimSun			; % CIDFnmap.Win
- %/STFangsong-Light	/zycjkfangs		; % CIDFnmap.Sol
- %/STFangsong-Light	/SimSun			; % CIDFnmap.Win
- %/STHeiti-Regular	/zycjkhei		; % CIDFnmap.Sol
- %/STHeiti-Regular	/SimHei			; % CIDFnmap.Win
--%/STKaiti-Regular	/GBZenKai-Medium	; % CIDFnmap.ARP
-+/STKaiti-Regular	/GBZenKai-Medium	; % CIDFnmap.ARP
- %/STKaiti-Regular	/zycjkkai		; % CIDFnmap.Sol
- 
- %
-@@ -76,18 +76,18 @@
- %
- %/Ryumin-Light		/WadaMin-Regular	; % CIDFnmap.Ore
- %/Ryumin-Light		/HG-MinchoL		; % CIDFnmap.Sol
--%/Ryumin-Light		/Kochi-Mincho		; % CIDFnmap.Koc
-+/Ryumin-Light		/Kochi-Mincho		; % CIDFnmap.Koc
- %/Ryumin-Light		/MS-Mincho		; % CIDFnmap.Win
- %/GothicBBB-Medium	/WadaGo-Bold		; % CIDFnmap.Ore
- %/GothicBBB-Medium	/HG-GothicB		; % CIDFnmap.Sol
--%/GothicBBB-Medium	/Kochi-Gothic		; % CIDFnmap.Koc
-+/GothicBBB-Medium	/Kochi-Gothic		; % CIDFnmap.Koc
- %/GothicBBB-Medium	/MS-Gothic		; % CIDFnmap.Win
- %/HeiseiMin-W3		/MS-Mincho		; % CIDFnmap.Win
- %/HeiseiKakuGo-W5	/MS-Gothic		; % CIDFnmap.Win
- 
--%/HeiseiMin-W3H		/WadaMin-RegularH	; % CIDFnmap.Ore
-+/HeiseiMin-W3H		/WadaMin-RegularH	; % CIDFnmap.Ore
- %/HeiseiMin-W3H		/MS-Mincho-Adobe-Japan2	; % CIDFnmap.Win
--%/HeiseiKakuGo-W5H	/WadaMaruGo-RegularH	; % CIDFnmap.Ore
-+/HeiseiKakuGo-W5H	/WadaMaruGo-RegularH	; % CIDFnmap.Ore
- %/HeiseiKakuGo-W5H	/MS-Gothic-Adobe-Japan2	; % CIDFnmap.Win
- 
- %/KozMin-Regular	/MS-Mincho		; % CIDFnmap.Win
-@@ -97,17 +97,17 @@
- % Convenient aliases for PS files on Korean PostScript printer
- %
- %/HYGoThic-Medium	/MunhwaGothic-Regular	; % CIDFnmap.Ore
--%/HYGoThic-Medium	/Baekmuk-Dotum		; % CIDFnmap.Bae
-+/HYGoThic-Medium	/Baekmuk-Dotum		; % CIDFnmap.Bae
- %/HYGoThic-Medium	/Gothic			; % CIDFnmap.Sol
- %/HYGoThic-Medium	/Dotum			; % CIDFnmap.Win
- %/HYGungSo-Bold		/Gungsuh		; % CIDFnmap.Win
--%/HYKHeadLine-Bold	/Baekmuk-Headline	; % CIDFnmap.Bae
--%/HYKHeadLine-Medium	/Baekmuk-Headline	; % CIDFnmap.Bae
-+/HYKHeadLine-Bold	/Baekmuk-Headline	; % CIDFnmap.Bae
-+/HYKHeadLine-Medium	/Baekmuk-Headline	; % CIDFnmap.Bae
- %/HYSMyeongJo-Medium	/Munhwa-Regular		; % CIDFnmap.Ore
--%/HYSMyeongJo-Medium	/Baekmuk-Batang		; % CIDFnmap.Bae
-+/HYSMyeongJo-Medium	/Baekmuk-Batang		; % CIDFnmap.Bae
- %/HYSMyeongJo-Medium	/Myeongjo		; % CIDFnmap.Sol
- %/HYSMyeongJo-Medium	/Batang			; % CIDFnmap.Win
--%/HYRGoThic-Medium	/Baekmuk-Gulim		; % CIDFnmap.Bae
-+/HYRGoThic-Medium	/Baekmuk-Gulim		; % CIDFnmap.Bae
- %/HYRGoThic-Medium	/RoundedGothic		; % CIDFnmap.Sol
- %/HYRGoThic-Medium	/Gulim			; % CIDFnmap.Win
- 
-diff -urN espgs-7.07.1/lib/CIDFnmap.Koc espgs-7.07.1.patched/lib/CIDFnmap.Koc
---- espgs-7.07.1/lib/CIDFnmap.Koc	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.07.1.patched/lib/CIDFnmap.Koc	2005-04-23 22:27:11.000000000 +0900
-@@ -30,8 +30,8 @@
- %	Kochi-Mincho: Public domain, except for NAGA10 bitmap data
- %	Kochi-Gothic: Wada Lab's font license, except for NAGA10 bitmap data
- %
--%/Kochi-Mincho	(kochi-mincho.ttf)	;
--%/Kochi-Gothic	(kochi-gothic.ttf)	;
-+/Kochi-Mincho	(kochi-mincho-subst.ttf)	;
-+/Kochi-Gothic	(kochi-gothic-subst.ttf)	;
- %
- % Notice: In CID-keyed space of Kochi-Mincho, although you may find that
- % CIDs 7611,7613-7625,7629,7630,11847,12041-12043 are incorrectly
-@@ -45,6 +45,6 @@
- %	Kochi-Mincho: Public domain. Designed by Yasuyuki Furukawa.
- %	Kochi-Gothic: Wada Lab's font license.
- %
--/Kochi-Mincho	(Kochi-Mincho)	;
--/Kochi-Gothic	(Kochi-Gothic)	;
-+%/Kochi-Mincho	(Kochi-Mincho)	;
-+%/Kochi-Gothic	(Kochi-Gothic)	;
- 
-diff -urN espgs-7.07.1/lib/gs_res.ps.in espgs-7.07.1.patched/lib/gs_res.ps.in
---- espgs-7.07.1/lib/gs_res.ps.in	2002-10-05 01:35:24.000000000 +0900
-+++ espgs-7.07.1.patched/lib/gs_res.ps.in	2005-04-23 22:27:11.000000000 +0900
-@@ -245,8 +245,8 @@
-   /pssystemparams 10 dict readonly def
- } if
- pssystemparams begin
--  /FontResourceDir (@datadir@/ghostscript/fonts/) readonly .forcedef	% pssys'params is r-o
--  /GenericResourceDir (@datadir@/ghostscript/) readonly .forcedef	% pssys'params is r-o
-+  /FontResourceDir (@datadir@/ghostscript/Resource/Font/) readonly .forcedef	% pssys'params is r-o
-+  /GenericResourceDir (@datadir@/ghostscript/Resource/) readonly .forcedef	% pssys'params is r-o
-   /GenericResourcePathSep (/) readonly .forcedef	% pssys'params is r-o
- end
- end
diff --git a/app-text/ghostscript-esp/files/ijs-dirinstall.diff b/app-text/ghostscript-esp/files/ijs-dirinstall.diff
deleted file mode 100644
index af641cc40d39..000000000000
--- a/app-text/ghostscript-esp/files/ijs-dirinstall.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur espgs-8.15.1/ijs.orig/Makefile.in espgs-8.15.1/ijs/Makefile.in
---- espgs-8.15.1/ijs.orig/Makefile.in	2006-02-05 17:36:14.000000000 +0100
-+++ espgs-8.15.1/ijs/Makefile.in	2006-02-05 17:41:57.000000000 +0100
-@@ -326,7 +326,7 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(DESTDIR)$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-@@ -355,7 +355,7 @@
- 	$(LINK) -rpath $(libdir) $(libijs_la_LDFLAGS) $(libijs_la_OBJECTS) $(libijs_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(DESTDIR)$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -495,7 +495,7 @@
- 	done
- install-pkgincludeHEADERS: $(pkginclude_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
-+	test -z "$(DESTDIR)$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
- 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \