add fontconfig support, bug #40808

13 files changed, 165 insertions, 1302 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 9e5e786a7ec2..f8616be213df 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.61 2004/07/27 02:29:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.62 2004/08/04 16:10:14 lanius Exp $
+
+*ghostscript-7.07.1-r4 (04 Aug 2004)
+
+  04 Aug 2004; Heinrich Wendel <lanius@gentoo.org>
+  ghostscript-7.07.1-r4.ebuild, files/gs7.07.1-fontconfig-rh.patch.bz2:
+  add fontconfig support, bug #40808
 
   26 Jul 2004; Tom Gall <tgall@gentoo.org> ghostscript-7.07.1-r3.ebuild:
   stable on ppc64
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index c7ddeae6ca33..60ff08214841 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,18 +1,21 @@
-MD5 bf3078f9ecfedab81f9f47b66f8786fb ChangeLog 10016
-MD5 0630535dc8e09a56b144d756bdb211ef ghostscript-7.05.6.ebuild 2656
-MD5 0c3b4e549fd62104ea87a7fe1728d13b ghostscript-7.07.1-r1.ebuild 3087
-MD5 f03ac964bd02a6935e57f98d44c897f2 ghostscript-7.07.1-r2.ebuild 3195
-MD5 4e7f6b1a03183be57ea0c76b0e3470d5 ghostscript-7.07.1-r3.ebuild 3340
+MD5 2b6b5d55714badc617b2824a5af3f222 ghostscript-7.07.1-r2.ebuild 3195
+MD5 6128e48e5de0b815d80c8ed92b8c356e ghostscript-7.05.6.ebuild 2707
+MD5 c5370b22a88d494b5e178b2ed1002d94 ghostscript-7.07.1-r4.ebuild 3498
+MD5 20d88f95b9e027f188995fd9b0d131a2 ghostscript-7.07.1-r1.ebuild 3087
+MD5 b058d61cf77936b01739be0d44818ab6 ChangeLog 10216
+MD5 7fb13fb59d898966da7e07793cd778c7 ghostscript-7.07.1-r3.ebuild 3345
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
+MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
+MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
+MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
+MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r1 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r2 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r3 291
+MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r4 291
+MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
+MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
-MD5 286fde55f66a662388d3004e6d8d896a files/gs7.05-gdevhl12.c 22009
-MD5 f0a076c486b8d72e90c8aac2355ccd4d files/gs7.05.6-cjk.diff 20038
+MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
 MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
-MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
 MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
-MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
-MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.07.1-r4 b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r4
new file mode 100644
index 000000000000..986bb4d51dda
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r4
@@ -0,0 +1,4 @@
+MD5 d30bf5c09f2c7caa8291f6305cf03044 espgs-7.07.1-source.tar.bz2 5400198
+MD5 6865682b095f8c4500c54b285ff05ef6 ghostscript-fonts-std-8.11.tar.gz 3752871
+MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
+MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
diff --git a/app-text/ghostscript/files/gs7.05-gdevhl12.c b/app-text/ghostscript/files/gs7.05-gdevhl12.c
deleted file mode 100644
index 1c29dbc2db35..000000000000
--- a/app-text/ghostscript/files/gs7.05-gdevhl12.c
+++ /dev/null
@@ -1,742 +0,0 @@
-/*
-   Contributors:
-     Created by Marek Michalkiewicz <marekm@amelek.gda.pl>
-
-   THIS SOFTWARE IS NOT COPYRIGHTED
-
-   This source code is offered for use in the public domain.  You may
-   use, modify or distribute it freely.
-
-   This code is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
-   DISCLAIMED.  This includes but is not limited to warranties of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-   (Legalese borrowed from the Mingw32 runtime libraries.)
- */
-
-/*$Id: gs7.05-gdevhl12.c,v 1.5 2004/06/29 23:55:42 lu_zero Exp $ */
-/* gdevhl12.c - Brother HL-1250 driver for Ghostscript */
-
-/*
-   This driver handles the 1200x600 dpi mode, and some settings like
-   paper source and toner save mode.  600x600 dpi and below is handled
-   by gdevdljm.c (basically as in the ljet4 device, with minor changes
-   in initialization and margins, and PCL wrapped in PJL).
-
-   There are two device names made available by this driver, which
-   differ only in the default (maximum) resolution:
-
-     -sDEVICE=hl1240
-	600x600 dpi, for HL-1030/1240 (uses standard PCL modes 2 and 3)
-
-     -sDEVICE=hl1250
-	1200x600 dpi, for HL-1050/1070/1250/1270N
-	(uses special compression mode 1027 for 1200x600 dpi,
-	otherwise modes 2 and 3 as above)
-
-   Tested with a HL-1250, both 1200x600 and 600x600 dpi.  Please test
-   with other models and report results (both problems and success).
-   Some notes on the other models:
-
-     HL-1070 and HL-1270N
-	can also print Postscript directly, at maximum 600x600 dpi
-	(this driver can print 1200x600 dpi using mode 1027).
-
-     HL-1240
-	should no longer be limited to 300 dpi - this driver sends
-	the recommended "@PJL SET RESOLUTION=..." command.  PLEASE TEST.
-	There have been some vague problem reports (wrong margins? not
-	clear for what paper size, quite possibly Letter, not A4?) with
-	this printer, if you have it and some Ghostscript hacking skills,
-	_please_ try to help, fix it and send me a patch - thanks!
-
-     HL-1030
-	should no longer be "Paperweight" despite the "for Windows only"
-	warning :-) - it knows enough PCL to print raster graphics, but
-	*requires* "@PJL ENTER LANGUAGE=PCL", so it does not work with
-	the ljet4 driver sending raw PCL.  The windows driver uses an
-	undocumented compression mode 1030, but modes 2 and 3 work too.
-	PLEASE TEST.
-
-   New models, still need to be tested:
-     HL-1230 (GDI printer)
-     HL-1440 (GDI printer)
-     HL-1450 (PCL6 and PS2 emulation)
-     HL-1470N (PCL6 and PS2 emulation)
-
-   Additional settings (gs command line options) for this driver:
-
-     -dEconoMode=0...2
-	toner save mode: 0 = disabled (default), 1 = 25%, 2 = 50%
-
-     -dPaperType=0...4
-	paper type: 0 = plain (default), 1 = thin, 2 = thick, 3 = thicker,
-	4 = transparency
-
-     -dSourceTray=0...4
-	paper source: 0 = auto (default), 1 = dual, 2 = upper, 3 = lower,
-	4 = manual (not all models support the optional lower tray)
-
-   The 1200x600 dpi mode may require a lot of printer memory - the manual
-   recommends at least 10 MB; for me it seems to work well with 8 MB: 4 MB
-   standard + 4 MB "finally found some good use for that old PS/2 SIMM" :-).
-   Even at just 600x600 dpi (normal PCL 5 control codes) print quality is
-   very good, at 1200x600 dpi it is difficult to see the difference (more
-   visible on grayscale images).  So 600x600 dpi is best for general use.
-
-   The HL-1250 also supports PCL 6 (PCL XL) but
-   - I don't have the documentation for that
-   - the pxlmono driver works, but the output looks a bit different
-     from that generated by the ljet4 or (this) 1200x600 dpi driver
-     (lines appear very thin - not yet sure if this is a driver bug
-     or differences in PCL 6 implementation, someone should check on
-     a HP printer, does tiger.ps printed using the ljet4 and pxlmono
-     drivers, both at 600x600 dpi, look the same?)
-   so let's use the good old ljet4 (PCL 5) driver for now.
-   (PCL 6 seems to offer better compression though.)
-
-   To do: the undocumented mode 1030 may offer better compression
-   (may help print complex graphics at 600 dpi - the HL-1030/1240 have
-   only 2 MB of non-expandable RAM, which may not be enough for data
-   that doesn't compress well).  The windows driver uses this mode for
-   all models, not just HL-1030.  Documentation may be available later.
-
-   Many thanks to Richard Thomas <richardt@brother.co.uk> for help
-   (sending me a HL-1250, documentation, answering my questions).
-
-   Thanks to L. Peter Deutsch <ghost@aladdin.com> for making gdevdjet.c
-   and gdevdljm.[ch] available under a dual AFPL/GPL license.
- */
-
-#include "gdevprn.h"
-#include "gdevdljm.h"
-
-#ifdef X_DPI
-#  define X_DPI2 X_DPI
-#else
-#  define X_DPI 600
-#  define X_DPI2 1200
-#endif
-
-#ifndef Y_DPI
-#  define Y_DPI 600
-#endif
-
-typedef enum {
-    ECONO_OFF = 0,
-    ECONO_25,
-    ECONO_50
-} hl1250_econo_t;
-
-typedef enum {
-    PTYPE_PLAIN = 0,
-    PTYPE_THIN,
-    PTYPE_THICK,
-    PTYPE_THICK2,
-    PTYPE_TRANS
-} hl1250_paper_t;
-
-typedef enum {
-    TRAY_AUTO = 0,
-    TRAY_DUAL,
-    TRAY_UPPER,
-    TRAY_LOWER,
-    TRAY_MANUAL
-} hl1250_tray_t;
-
-typedef struct gx_device_hl1250_s {
-    gx_device_common;
-    gx_prn_device_common;
-    hl1250_econo_t econo_mode;
-    hl1250_paper_t paper_type;
-    hl1250_tray_t source_tray;
-} gx_device_hl1250;
-
-private dev_proc_open_device(hl1250_open);
-private dev_proc_close_device(hl1250_close);
-private dev_proc_print_page_copies(hl1250_print_page_copies);
-private dev_proc_get_params(hl1250_get_params);
-private dev_proc_put_params(hl1250_put_params);
-
-private const gx_device_procs prn_hl1250_procs =
-prn_params_procs(hl1250_open, gdev_prn_output_page, hl1250_close,
-		 hl1250_get_params, hl1250_put_params);
-
-#define hl1250_device_copies(dname, xdpi, ydpi)\
-{   prn_device_std_body_copies(gx_device_hl1250, prn_hl1250_procs,\
-			       dname,\
-			       DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,\
-			       xdpi, ydpi,\
-			       0, 0, 0, 0,\
-			       1, hl1250_print_page_copies),\
-    ECONO_OFF, PTYPE_PLAIN, TRAY_AUTO\
-}
-
-const gx_device_hl1250 gs_hl1250_device =
-hl1250_device_copies("hl1250", X_DPI2, Y_DPI);
-
-const gx_device_hl1250 gs_hl1240_device =
-hl1250_device_copies("hl1240", X_DPI, Y_DPI);
-
-/* defines for the 1200x600 dpi mode (mode 1027) */
-
-/* max number of 16-bit words in one 1200 dpi scan line */
-#define SCAN_WORDS 640
-
-/* number of scan lines per band */
-#define BAND_SCANS 64
-
-/* max number of 16-bit words in one 64-line band after compression,
-   limited by 16-bit length field - 7 bytes header + 0xFFF8 bytes data -
-   note that we may have to lose some data if it can't compress well
-   (maximum possible uncompressed data length is about 80K).  */
-#define MAX_BAND_WORDS 0x7FFC
-
-/* codes (16-bit words) to send in the 1200x600 dpi data block: */
-
-/* vertical compression (copy COUNT words from the previous line) */
-#define HL_VERT(count) (0xE000 | (count))
-
-/* 16-bit horizontal compression (repeat the next word COUNT times) */
-#define HL_HOR16(count) (0x8000 | (count))
-
-/* 8-bit horiz. compression (repeat DATA byte COUNT*2 times, COUNT < 32) */
-#define HL_HOR8(count, data) (0xC000 | ((count) << 8) | ((data) & 0xFF))
-
-/* 4-bit horiz. compression (repeat DATA nibble COUNT*4 times, COUNT < 512) */
-#define HL_HOR4(count, data) (0xA000 | (count) | (((data) & 0x0F) << 9))
-
-/* no compression, COUNT words of data follow */
-#define HL_COPY(count) ((count) << 4)
-
-typedef unsigned short u16;
-
-/* The printer expects 16-bit data words in big endian order.  */
-#if arch_is_big_endian
-#define cpu_to_be16(x) (x)
-#else
-private u16
-cpu_to_be16(u16 x)
-{
-    return (x >> 8) | (x << 8);
-}
-#endif
-
-typedef struct hl1250_state_s {
-    /* smallest area that contains all black dots of the band */
-    /* x = xl..xr-1, y = yt..yb-1, width=xr-xl, height=yb-yt */
-    unsigned int xl, xr, yt, yb;
-
-    /* number of words in the output buffer */
-    unsigned int out_count;
-
-    /* output buffer for compressed data */
-    u16 out_buf[MAX_BAND_WORDS];
-
-    /* input buffer for one 64-line band */
-    u16 in_buf[BAND_SCANS][SCAN_WORDS];
-} hl1250_state_t;
-
-/*
-   find the smallest rectangle that contains all black dots of the
-   band (in other words, the outside of that rectangle is all white)
-   returns 0 if the band is completely white, else 1
-   XXX - it should be faster to scan 32-bit (instead of 16-bit) words
- */
-private int
-hl1250_check_area(hl1250_state_t * s)
-{
-    unsigned int x, y, xleft, xright, ytop, ybottom;
-    int line_not_white, band_not_white;
-
-    band_not_white = 0;
-    xright = s->xl;
-    xleft = s->xr;
-    ybottom = s->yt;
-    ytop = s->yb;
-    for (y = s->yt; y < s->yb; y++) {
-	line_not_white = 0;
-	for (x = s->xl; x < s->xr; x++) {
-	    if (s->in_buf[y][x]) {
-		if (xleft > x)
-		    xleft = x;
-		if (xright <= x)
-		    xright = x + 1;
-		line_not_white = 1;
-	    }
-	}
-	if (line_not_white) {
-	    if (ytop > y)
-		ytop = y;
-	    if (ybottom <= y)
-		ybottom = y + 1;
-	    band_not_white = 1;
-	}
-    }
-    if (band_not_white) {
-	s->xl = xleft;
-	s->xr = xright;
-	s->yt = ytop;
-	s->yb = ybottom;
-    } else {
-	s->xr = s->xl;
-	s->yb = s->yt;
-    }
-    return band_not_white;
-}
-
-/*
-   Compressed data of this band is larger than MAX_BAND_WORDS.
-   Repeat each line using vertical compression, effectively reducing
-   resolution to 1200x300 dpi.  This shouldn't happen too often.
- */
-private void
-hl1250_lose_resolution(hl1250_state_t * s)
-{
-    unsigned int x, y;
-    u16 data0, data1, mask;
-    u16 *out;
-    const u16 *line0;
-    const u16 *line1;
-    unsigned int width = s->xr - s->xl;
-
-    out = s->out_buf;
-    for (y = s->yt; y < s->yb; y += 2) {
-	line0 = &s->in_buf[y][s->xl];
-	line1 = line0;
-	if (y + 1 < s->yb)
-	    line1 = &s->in_buf[y + 1][s->xl];
-	mask = (y & 2) ? 0x5555 : 0xAAAA;
-	*out++ = cpu_to_be16(HL_COPY(width));
-	for (x = 0; x < width; x++) {
-	    data0 = line0[x];
-	    data1 = line1[x];
-	    *out++ = (data0 & data1) | (data0 & mask) | (data1 & mask);
-	}
-	*out++ = cpu_to_be16(HL_VERT(width));
-    }
-    s->out_count = out - s->out_buf;
-}
-
-/*
-   Try to compress a single scan line.
-   Return 1 on success, 0 on failure (data doesn't compress
-   well enough to fit in MAX_BAND_WORDS words, truncated).
- */
-private int
-hl1250_compress_line(hl1250_state_t * s, unsigned int y)
-{
-    unsigned int total_len;	/* total data words after compression */
-    unsigned int copy_len;	/* number of words to copy uncompressed */
-    unsigned int hlen, vlen;	/* length for hor. and vert. compression */
-    unsigned int clen, ulen;	/* compressed and uncompressed words */
-    u16 data;			/* word currently being processed */
-    u16 hl_code;		/* code to send */
-    int x, i;
-    u16 *out;
-    unsigned int width = s->xr - s->xl;
-    const u16 *line = &s->in_buf[y][s->xl];
-    const u16 *prev = (y > s->yt ? &s->in_buf[y - 1][s->xl] : NULL);
-
-    out = &s->out_buf[s->out_count];
-    x = 0;
-    copy_len = 0;
-    total_len = s->out_count;
-    while (x < width) {
-	data = line[x];
-
-	/* how many words (hlen >= 1) to repeat */
-	for (i = x + 1; i < width; i++) {
-	    if (line[i] != data)
-		break;
-	}
-	hlen = i - x;
-	/* if not the first line, try vertical compression */
-	vlen = 0;
-	if (prev) {
-	    for (i = x; i < width; i++) {
-		if (line[i] != prev[i])
-		    break;
-	    }
-	    vlen = i - x;
-	}
-	/* find the best method to encode the data */
-	ulen = hlen;
-	clen = 1;
-	if (vlen >= hlen) {
-	    /* vertical compression */
-	    ulen = vlen;
-	    hl_code = HL_VERT(vlen);
-	} else if ((data ^ (data >> 8)) & 0xFF) {
-	    /* 16-bit horizontal compression */
-	    hl_code = HL_HOR16(hlen);
-	    clen = 2;
-	} else if ((data ^ (data >> 4)) & 0x0F) {
-	    /* 8-bit horizontal compression (if possible) */
-	    if (hlen < 32) {
-		hl_code = HL_HOR8(hlen, data);
-	    } else {
-		hl_code = HL_HOR16(hlen);
-		clen = 2;
-	    }
-	} else {
-	    /* 4-bit horizontal compression (if possible) */
-	    if (hlen < 512) {
-		hl_code = HL_HOR4(hlen, data);
-	    } else {
-		hl_code = HL_HOR16(hlen);
-		clen = 2;
-	    }
-	}
-	/*
-	   now see if we should copy the word without compression
-	   (the cost of leaving/re-entering copy mode is one word).
-	 */
-	if (ulen < clen + (copy_len > 0)) {
-	    /* yes, copy */
-	    copy_len += ulen;
-	} else {
-	    if (copy_len) {
-		/* first, copy data (if any) */
-		total_len += copy_len + 1;
-		if (total_len > MAX_BAND_WORDS)
-		    goto error_out;
-		*out++ = cpu_to_be16(HL_COPY(copy_len));
-		memcpy(out, &line[x - copy_len], copy_len * sizeof(u16));
-		out += copy_len;
-		copy_len = 0;
-	    }
-	    /* now send the current code */
-	    total_len += clen;
-	    if (total_len > MAX_BAND_WORDS)
-		goto error_out;
-	    *out++ = cpu_to_be16(hl_code);
-	    if (clen == 2) {
-		/* 16-bit compression */
-		*out++ = data;
-	    }
-	}
-	/* move to the next word to process */
-	x += ulen;
-    }
-    /* copy anything left at the end */
-    if (copy_len) {
-	total_len += copy_len + 1;
-	if (total_len > MAX_BAND_WORDS)
-	    goto error_out;
-	*out++ = cpu_to_be16(HL_COPY(copy_len));
-	memcpy(out, &line[width - copy_len], copy_len * sizeof(u16));
-	out += copy_len;
-    }
-  error_out:
-    s->out_count = out - s->out_buf;
-    return (total_len <= MAX_BAND_WORDS);
-}
-
-/*
-   send a 16-bit big endian value
- */
-private void
-put_be16(FILE * fp, u16 data)
-{
-    putc(data >> 8, fp);
-    putc(data & 0xFF, fp);
-}
-
-/*
-   prn_stream = data sent to the printer
-   s->xl,xr,yt,yb,in_buf = band (max 64 lines), coordinates band-relative
-   band = Y coordinate of the band from top of page
- */
-private void
-hl1250_compress_band(FILE * prn_stream, hl1250_state_t * s, unsigned int band)
-{
-    unsigned int y, ytop, ybottom;
-
-    s->out_count = 0;
-
-    if (!hl1250_check_area(s))
-	return;
-
-    /*
-       It seems HL-1250 1200x600 dpi mode has an undocumented feature -
-       it rounds the X left coordinate of the image up to next 32 dots.
-       Probably the RISC inside likes 32-bit alignment.  No big problem,
-       we just have to round it down (it's in 16-bit words here).
-     */
-    s->xl &= ~1;
-
-    ytop = s->yt;
-    ybottom = s->yb;
-    for (y = ytop; y < ybottom; y++) {
-	if (hl1250_compress_line(s, y))
-	    continue;
-#if 1
-	/* XXX - please report if you ever see this, then change to #if 0 */
-	fprintf(stderr,
-		"hl1250: compression failed (y=%u), doing 1200x300 dpi\n",
-		band + y);
-#endif
-	hl1250_lose_resolution(s);
-	break;
-    }
-    if (s->out_count) {
-	fprintf(prn_stream, "\033*b%uW", s->out_count * sizeof(u16) + 9);
-	put_be16(prn_stream, s->out_count * sizeof(u16) + 7);
-	put_be16(prn_stream, s->xl * 16);
-	put_be16(prn_stream, band + ytop);
-	putc(ybottom - ytop, prn_stream);
-	put_be16(prn_stream, s->xr - s->xl);
-	fwrite(s->out_buf, sizeof(u16), s->out_count, prn_stream);
-    }
-}
-
-
-private int
-hl1250_print_1200dpi(gx_device_printer * pdev, FILE * prn_stream,
-		     int num_copies, const char *page_init)
-{
-    int band, lnum;
-    int code = 0;
-    hl1250_state_t *s;
-    int line_size = gdev_prn_raster(pdev);
-    int num_rows = dev_print_scan_lines(pdev);
-    int paper_size = gdev_pcl_paper_size((gx_device *) pdev);
-
-    s = (hl1250_state_t *) gs_alloc_byte_array(pdev->memory, 1, sizeof(*s),
-					       "hl1250_print_1200dpi");
-    if (!s)
-	return_error(gs_error_VMerror);
-
-    memset(s, 0, sizeof(*s));
-
-    if (line_size > sizeof(s->in_buf[0]))
-	line_size = sizeof(s->in_buf[0]);
-
-    if (pdev->PageCount == 0) {
-	/* reset, set paper size */
-	fprintf(prn_stream, "\033E\033&l%dA", paper_size);
-    }
-    fputs("\033&u1200D", prn_stream);
-    fputs("\033&l0o0l0E", prn_stream);
-    fputs(page_init, prn_stream);
-    fprintf(prn_stream, "\033&l%dX", num_copies);
-    fputs("\033*rB\033*p0x0Y", prn_stream);
-
-    /* set 600dpi (vertical) resolution */
-    fputs("\033*t600R", prn_stream);
-
-    /* start raster graphics */
-    fputs("\033*r1A", prn_stream);
-
-    /* transfer data in the special 1200x600 dpi format */
-    fputs("\033*b1027M", prn_stream);
-
-    for (band = 0; band < num_rows; band += BAND_SCANS) {
-	int next_band = band + BAND_SCANS;
-
-	if (next_band > num_rows)
-	    next_band = num_rows;
-	for (lnum = band; lnum < next_band; lnum++) {
-	    code = gdev_prn_copy_scan_lines(pdev, lnum,
-			      (byte *) (s->in_buf[lnum - band]), line_size);
-	    if (code < 0)
-		goto error_out;
-	}
-	s->yt = 0;
-	s->yb = next_band - band;
-	s->xl = 0;
-	s->xr = 635;		/* max width */
-	hl1250_compress_band(prn_stream, s, band);
-    }
-  error_out:
-    fputs("\033*rB\f", prn_stream);
-    gs_free_object(pdev->memory, s, "hl1250_print_1200dpi");
-    return code;
-}
-
-
-private int
-hl1250_open(gx_device * pdev)
-{
-    /* margins: left, bottom, right, top */
-    /* XXX - only A4 tested, letter size margins likely need to be tweaked */
-    static const float margins_a4_600[4] = {0.05, 0.15, 0.25, 0.15};
-    static const float margins_a4_1200[4] = {0.05, 0.2, 0.1, 0.15};
-    static const float margins_letter_600[4] = {0.05, 0.15, 0.25, 0.15};
-    static const float margins_letter_1200[4] = {0.05, 0.2, 0.1, 0.15};
-
-    int x_dpi = (int)((gx_device_printer *) pdev)->x_pixels_per_inch;
-    int paper_size = gdev_pcl_paper_size(pdev);
-
-    if (x_dpi == 1200) {
-	if (paper_size == PAPER_SIZE_A4)
-	    gx_device_set_margins(pdev, margins_a4_1200, true);
-	else
-	    gx_device_set_margins(pdev, margins_letter_1200, true);
-    } else {
-	if (paper_size == PAPER_SIZE_A4)
-	    gx_device_set_margins(pdev, margins_a4_600, false);
-	else
-	    gx_device_set_margins(pdev, margins_letter_600, false);
-    }
-    return gdev_prn_open(pdev);
-}
-
-#define UEL "\033%-12345X"
-
-/* XXX - how to get the name of the job (PS file) being printed? */
-#define PJL_JOB_NAME "Ghost"
-
-private int
-hl1250_close(gx_device * pdev)
-{
-    int code = gdev_prn_open_printer(pdev, 1);
-    FILE *fp;
-
-    if (code < 0)
-	return code;
-    fp = ((gx_device_printer *) pdev)->file;
-    /* job separation, reset, UEL */
-    fputs("\033&l1T\033E", fp);
-    fputs(UEL, fp);
-    fprintf(fp, "@PJL EOJ NAME=\"%s\"\r\n", PJL_JOB_NAME);
-    fputs(UEL, fp);
-    return gdev_prn_close(pdev);
-}
-
-
-private int
-hl1250_print_page_copies(gx_device_printer * pdev, FILE * prn_stream,
-			 int num_copies)
-{
-    int x_dpi = (int)pdev->x_pixels_per_inch;
-    int y_dpi = (int)pdev->y_pixels_per_inch;
-    const char *tray_pjl;
-    const char *tray_pcl;
-    const gx_device_hl1250 *hl1250 = (gx_device_hl1250 *) pdev;
-    hl1250_econo_t econo_mode = hl1250->econo_mode;
-    hl1250_paper_t paper_type = hl1250->paper_type;
-    hl1250_tray_t source_tray = hl1250->source_tray;
-    static const char * const onoff[2] = { "OFF", "ON" };
-    static const char * const papertypes[5] =
-	{ "REGULAR", "THIN", "THICK", "THICK2", "TRANSPARENCY" };
-
-    tray_pjl = "AUTO";
-    tray_pcl = "";
-    switch (source_tray) {
-	case TRAY_DUAL:
-	    tray_pcl = "\033&l0H";
-	    break;
-	case TRAY_UPPER:
-	    tray_pjl = "TRAY1";
-	    tray_pcl = "\033&l1H";
-	    break;
-	case TRAY_LOWER:
-	    tray_pjl = "TRAY2";
-	    tray_pcl = "\033&l5H";
-	    break;
-	case TRAY_MANUAL:
-	    tray_pcl = "\033&l2H";
-	    break;
-	default:
-	    break;
-    }
-    if (pdev->PageCount == 0) {
-	/* initialize printer */
-	fputs(UEL, prn_stream);
-	fputs("@PJL \r\n", prn_stream);
-	fprintf(prn_stream, "@PJL JOB NAME=\"%s\"\r\n", PJL_JOB_NAME);
-	fprintf(prn_stream, "@PJL SET ECONOMODE=%s\n", onoff[econo_mode != 0]);
-	if (econo_mode)
-	    fprintf(prn_stream, "@PJL SET ECONOLEVEL=%d\n", 3 - (int)econo_mode);
-	fprintf(prn_stream, "@PJL SET MEDIATYPE=%s\n", papertypes[paper_type]);
-	fprintf(prn_stream, "@PJL SET SOURCETRAY=%s\n", tray_pjl);
-	fprintf(prn_stream, "@PJL SET RESOLUTION=%d\n", y_dpi);
-	fprintf(prn_stream, "@PJL SET RAS1200MODE=%s\n", onoff[x_dpi == 1200]);
-
-	fputs("@PJL ENTER LANGUAGE=PCL\n", prn_stream);
-    }
-    if (x_dpi != 1200) {
-	char page_init[100];
-
-	/* We get the printer to translate the coordinate system for us.
-	   It seems the HL-1250 needs a slightly different translation
-	   (-120, 0) compared to the one in the ljet4 driver (-180, 36)
-	   (X, Y coordinates here are specified in 1/720-inch units).  */
-
-	sprintf(page_init, "\033&l-120U\033*r0F\033&u%dD%s", y_dpi, tray_pcl);
-	return dljet_mono_print_page_copies(pdev, prn_stream, num_copies,
-					    y_dpi, PCL_LJ4_FEATURES, page_init);
-    }
-    return hl1250_print_1200dpi(pdev, prn_stream, num_copies, tray_pcl);
-}
-
-private int
-hl1250_put_param_int(gs_param_list * plist, gs_param_name pname,
-		     int *pvalue, int minval, int maxval, int ecode)
-{
-    int code, value;
-
-    code = param_read_int(plist, pname, &value);
-    switch (code) {
-	case 0:
-	    if (value < minval || value > maxval)
-		param_signal_error(plist, pname, gs_error_rangecheck);
-	    *pvalue = value;
-	    return (ecode < 0 ? ecode : 1);
-	case 1:
-	    return ecode;
-	default:
-	    return code;
-    }
-}
-
-private int
-hl1250_get_params(gx_device * pdev, gs_param_list * plist)
-{
-    gx_device_hl1250 *hl1250 = (gx_device_hl1250 *) pdev;
-    int code, val;
-
-    code = gdev_prn_get_params(pdev, plist);
-    if (code < 0)
-	return code;
-    val = hl1250->econo_mode;
-    code = param_write_int(plist, "EconoMode", &val);
-    if (code < 0)
-	return code;
-    val = hl1250->paper_type;
-    code = param_write_int(plist, "PaperType", &val);
-    if (code < 0)
-	return code;
-    val = hl1250->source_tray;
-    code = param_write_int(plist, "SourceTray", &val);
-    return code;
-}
-
-private int
-hl1250_put_params(gx_device * pdev, gs_param_list * plist)
-{
-    int code = 0;
-    gx_device_hl1250 *hl1250 = (gx_device_hl1250 *) pdev;
-    int econo_mode = hl1250->econo_mode;
-    int paper_type = hl1250->paper_type;
-    int source_tray = hl1250->source_tray;
-
-    code = hl1250_put_param_int(plist, "EconoMode", &econo_mode,
-				ECONO_OFF, ECONO_50, code);
-    code = hl1250_put_param_int(plist, "PaperType", &paper_type,
-				PTYPE_PLAIN, PTYPE_TRANS, code);
-    code = hl1250_put_param_int(plist, "SourceTray", &source_tray,
-				TRAY_AUTO, TRAY_MANUAL, code);
-    if (code < 0)
-	return code;
-    code = gdev_prn_put_params(pdev, plist);
-    if (code < 0)
-	return code;
-    hl1250->econo_mode = econo_mode;
-    hl1250->paper_type = paper_type;
-    hl1250->source_tray = source_tray;
-    return 0;
-}
diff --git a/app-text/ghostscript/files/gs7.05-gdevhl12.c.bz2 b/app-text/ghostscript/files/gs7.05-gdevhl12.c.bz2
new file mode 100644
index 000000000000..ee24370c634a
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.05-gdevhl12.c.bz2
diff --git a/app-text/ghostscript/files/gs7.05.6-cjk.diff b/app-text/ghostscript/files/gs7.05.6-cjk.diff
deleted file mode 100644
index e8b2e1fade41..000000000000
--- a/app-text/ghostscript/files/gs7.05.6-cjk.diff
+++ /dev/null
@@ -1,539 +0,0 @@
-diff -Naur espgs-7.05.6.orig/lib/CIDFnmap espgs-7.05.6/lib/CIDFnmap
---- espgs-7.05.6.orig/lib/CIDFnmap	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.05.6/lib/CIDFnmap	2003-01-09 03:09:00.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 -Naur espgs-7.05.6.orig/lib/CIDFnmap.ARP espgs-7.05.6/lib/CIDFnmap.ARP
---- espgs-7.05.6.orig/lib/CIDFnmap.ARP	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.05.6/lib/CIDFnmap.ARP	2003-01-09 02:26:43.000000000 +0900
-@@ -25,10 +25,10 @@
- 
- % Adobe-CNS1
- 
--/ZenKai-Medium		(bkai00mp.ttf)		;
--/ShanHeiSun-Light	(bsmi00lp.ttf)		;
-+/ZenKai-Medium		(/usr/share/fonts/ttf/zh_TW/bkai00mp.ttf)	;
-+/ShanHeiSun-Light	(/usr/share/fonts/ttf/zh_TW/bsmi00lp.ttf)	;
- 
- % Adobe-GB1
- 
--/BousungEG-Light-GB	(gbsn00lp.ttf)		;
--/GBZenKai-Medium	(gkai00mp.ttf)		;
-+/BousungEG-Light-GB	(/usr/share/fonts/ttf/zh_CN/gbsn00lp.ttf)	;
-+/GBZenKai-Medium	(/usr/share/fonts/ttf/zh_CN/gkai00mp.ttf)	;
-diff -Naur espgs-7.05.6.orig/lib/CIDFnmap.Bae espgs-7.05.6/lib/CIDFnmap.Bae
---- espgs-7.05.6.orig/lib/CIDFnmap.Bae	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.05.6/lib/CIDFnmap.Bae	2003-01-09 02:29:32.000000000 +0900
-@@ -25,7 +25,7 @@
- 
- % Adobe-Korea1
- 
--/Baekmuk-Batang		(batang.ttf)		;
--/Baekmuk-Dotum		(dotum.ttf)		;
--/Baekmuk-Gulim		(gulim.ttf)		;
--/Baekmuk-Headline	(hline.ttf)		;
-+/Baekmuk-Batang		(/usr/share/fonts/ttf/korean/baekmuk/batang.ttf);
-+/Baekmuk-Dotum		(/usr/share/fonts/ttf/korean/baekmuk/dotum.ttf)	;
-+/Baekmuk-Gulim		(/usr/share/fonts/ttf/korean/baekmuk/gulim.ttf)	;
-+/Baekmuk-Headline	(/usr/share/fonts/ttf/korean/baekmuk/hline.ttf)	;
-diff -Naur espgs-7.05.6.orig/lib/CIDFnmap.CJK espgs-7.05.6/lib/CIDFnmap.CJK
---- espgs-7.05.6.orig/lib/CIDFnmap.CJK	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.05.6/lib/CIDFnmap.CJK	2003-01-09 03:10:19.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,193 +97,193 @@
- % 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
- 
- %
- % Convenient aliases for PS files on Traditional Chinese Acrobat Distiller
- %
--%/DFKaiShu-SB-Estd-BF	/MKai-Medium		;
--%/LiGothicMed		/MKai-Medium		;
--%/LiSungLight		/MSung-Light		;
--%/Taipei		/Adobe-CNS1		;
-+/DFKaiShu-SB-Estd-BF	/MKai-Medium		;
-+/LiGothicMed		/MKai-Medium		;
-+/LiSungLight		/MSung-Light		;
-+/Taipei			/Adobe-CNS1		;
- 
- %
- % Convenient aliases for PS files on Simplified Chinese Acrobat Distiller
- %
--%/Beijing		/Adobe-GB1		;
--%/SIL-FangSong-		/STFangsong-Light	;
--%/SIL-FangSong-Reg-Jian	/STFangsong-Light	;
--%/SIL-Hei-Med-Jian	/STHeiti-Regular	;
--%/SIL-Kai-		/STKaiti-Regular	;
--%/SIL-Kai-Reg-Jian	/STKaiti-Regular	;
--%/SIL-Song-Reg-Jian	/STSong-Light		;
-+/Beijing		/Adobe-GB1		;
-+/SIL-FangSong-		/STFangsong-Light	;
-+/SIL-FangSong-Reg-Jian	/STFangsong-Light	;
-+/SIL-Hei-Med-Jian	/STHeiti-Regular	;
-+/SIL-Kai-		/STKaiti-Regular	;
-+/SIL-Kai-Reg-Jian	/STKaiti-Regular	;
-+/SIL-Song-Reg-Jian	/STSong-Light		;
- 
- %
- % Convenient aliases for PS files on Japanese Acrobat Distiller
- %
--%/ChuGothicBBB-Medium	/GothicBBB-Medium	;
-+/ChuGothicBBB-Medium	/GothicBBB-Medium	;
- %/ChuGothicBBB-Medium-Mono	/MS-Gothic	; % CIDFnmap.Win
--%/FutoGoB101-Bold	/GothicBBB-Medium	;
--%/FutoMinA101-Bold	/Ryumin-Light		;
--%/GothicMB101-Bold	/GothicBBB-Medium	;
--%/GothicMB101-hea	/GothicBBB-Medium	;
--%/GothicMB101-Ult	/GothicBBB-Medium	;
--%/HeiseiKakuGo-W3	/HeiseiKakuGo-W5	;
--%/HeiseiKakuGo-W7	/HeiseiKakuGo-W5	;
--%/HeiseiKakuGo-W9	/HeiseiKakuGo-W5	;
--%/HeiseiKakuGothic-W5	/HeiseiKakuGo-W5	;
--%/HeiseiMaruGo-W4	/HeiseiKakuGo-W5	;
--%/HeiseiMin-W5		/HeiseiMin-W3		;
--%/HeiseiMin-W7		/HeiseiMin-W3		;
--%/HeiseiMin-W9		/HeiseiMin-W3		;
--%/HeiseiMincho-W3	/HeiseiMin-W3		;
--%/HonMincho-M		/Ryumin-Light		;
--%/Jun34-Medium		/Ryumin-Light		;
--%/Jun101-Light		/Ryumin-Light		;
--%/Jun501-Bold		/Ryumin-Light		;
--%/KozMin-Bold		/GothicBBB-Medium	;
--%/KozMin-ExtraLight	/Ryumin-Light		;
--%/KozMin-Heavy		/GothicBBB-Medium	;
--%/KozMin-Light		/Ryumin-Light		;
--%/KozMin-Medium		/Ryumin-Light		;
--%/KyokaICA-Light	/Adobe-Japan1		;
--%/KyokaICA-Medium	/Adobe-Japan1		;
--%/KyokaICA-regular	/Adobe-Japan1		;
--%/LogoArl-Bold		/Adobe-Japan1		;
--%/LogoArl-Light		/Adobe-Japan1		;
--%/LogoArl-Medium	/Adobe-Japan1		;
--%/LogoArl-Ultra		/Adobe-Japan1		;
--%/LogoCut-Bold		/Adobe-Japan1		;
--%/LogoCut-Light		/Adobe-Japan1		;
--%/LogoCut-Medium	/Adobe-Japan1		;
--%/LogoCut-Ultra		/Adobe-Japan1		;
--%/LogoLine-Bold		/Adobe-Japan1		;
--%/LogoLine-Light	/Adobe-Japan1		;
--%/LogoLine-Medium	/Adobe-Japan1		;
--%/LogoLine-Ultra	/Adobe-Japan1		;
--%/MaruGothic-M		/GothicBBB-Medium	;
--%/MidashiGo-MB31	/GothicBBB-Medium	;
--%/MidashiMin-MA31	/Ryumin-Light		;
--%/Osaka			/Ryumin-Light		;
-+/FutoGoB101-Bold	/GothicBBB-Medium	;
-+/FutoMinA101-Bold	/Ryumin-Light		;
-+/GothicMB101-Bold	/GothicBBB-Medium	;
-+/GothicMB101-hea	/GothicBBB-Medium	;
-+/GothicMB101-Ult	/GothicBBB-Medium	;
-+/HeiseiKakuGo-W3	/HeiseiKakuGo-W5	;
-+/HeiseiKakuGo-W7	/HeiseiKakuGo-W5	;
-+/HeiseiKakuGo-W9	/HeiseiKakuGo-W5	;
-+/HeiseiKakuGothic-W5	/HeiseiKakuGo-W5	;
-+/HeiseiMaruGo-W4	/HeiseiKakuGo-W5	;
-+/HeiseiMin-W5		/HeiseiMin-W3		;
-+/HeiseiMin-W7		/HeiseiMin-W3		;
-+/HeiseiMin-W9		/HeiseiMin-W3		;
-+/HeiseiMincho-W3	/HeiseiMin-W3		;
-+/HonMincho-M		/Ryumin-Light		;
-+/Jun34-Medium		/Ryumin-Light		;
-+/Jun101-Light		/Ryumin-Light		;
-+/Jun501-Bold		/Ryumin-Light		;
-+/KozMin-Bold		/GothicBBB-Medium	;
-+/KozMin-ExtraLight	/Ryumin-Light		;
-+/KozMin-Heavy		/GothicBBB-Medium	;
-+/KozMin-Light		/Ryumin-Light		;
-+/KozMin-Medium		/Ryumin-Light		;
-+/KyokaICA-Light		/Adobe-Japan1		;
-+/KyokaICA-Medium	/Adobe-Japan1		;
-+/KyokaICA-regular	/Adobe-Japan1		;
-+/LogoArl-Bold		/Adobe-Japan1		;
-+/LogoArl-Light		/Adobe-Japan1		;
-+/LogoArl-Medium		/Adobe-Japan1		;
-+/LogoArl-Ultra		/Adobe-Japan1		;
-+/LogoCut-Bold		/Adobe-Japan1		;
-+/LogoCut-Light		/Adobe-Japan1		;
-+/LogoCut-Medium		/Adobe-Japan1		;
-+/LogoCut-Ultra		/Adobe-Japan1		;
-+/LogoLine-Bold		/Adobe-Japan1		;
-+/LogoLine-Light		/Adobe-Japan1		;
-+/LogoLine-Medium	/Adobe-Japan1		;
-+/LogoLine-Ultra		/Adobe-Japan1		;
-+/MaruGothic-M		/GothicBBB-Medium	;
-+/MidashiGo-MB31		/GothicBBB-Medium	;
-+/MidashiMin-MA31	/Ryumin-Light		;
-+/Osaka			/Ryumin-Light		;
- %/Osaka-Mono		/MS-Mincho		; % CIDFnmap.Win
--%/Ryumin-Bold		/Ryumin-Light		;
--%/Ryumin-heavy		/Ryumin-Light		;
--%/Ryumin-Light-KL	/Ryumin-Light		;
-+/Ryumin-Bold		/Ryumin-Light		;
-+/Ryumin-heavy		/Ryumin-Light		;
-+/Ryumin-Light-KL	/Ryumin-Light		;
- %/Ryumin-Light-KL-Mono	/MS-Mincho		; % CIDFnmap.Win
--%/Ryumin-Medium		/Ryumin-Light		;
--%/Ryumin-regular	/Ryumin-Light		;
--%/Ryumin-Ultra		/Ryumin-Light		;
--%/ShinGo-Bold		/GothicBBB-Medium	;
--%/ShinGo-Light		/GothicBBB-Medium	;
--%/ShinGo-Medium		/GothicBBB-Medium	;
--%/ShinGo-regular	/GothicBBB-Medium	;
--%/ShinGo-Ultra		/GothicBBB-Medium	;
--%/ShinseiKai-CBSK1	/Ryumin-Light		;
--%/TBKomachiG-B		/Adobe-Japan1		;
--%/TBKomachiG-DB		/Adobe-Japan1		;
--%/TBKomachiG-E		/Adobe-Japan1		;
--%/TBKomachiG-hv		/Adobe-Japan1		;
--%/TBKomachiG-M		/Adobe-Japan1		;
--%/TBKomachiG-R		/Adobe-Japan1		;
--%/TBKomachiM-DE		/Adobe-Japan1		;
--%/TBKomachiM-E		/Adobe-Japan1		;
--%/TBKomachiM-hv		/Adobe-Japan1		;
--%/TBKomachiM-M		/Adobe-Japan1		;
--%/TBKoudoukenG-B	/Adobe-Japan1		;
--%/TBKoudoukenG-DB	/Adobe-Japan1		;
--%/TBKoudoukenG-E	/Adobe-Japan1		;
--%/TBKoudoukenG-hv	/Adobe-Japan1		;
--%/TBKoudoukenG-M	/Adobe-Japan1		;
--%/TBKoudoukenG-R	/Adobe-Japan1		;
--%/TBKoudoukenM-DE	/Adobe-Japan1		;
--%/TBKoudoukenM-E	/Adobe-Japan1		;
--%/TBKoudoukenM-hv	/Adobe-Japan1		;
--%/TBKoudoukenM-M	/Adobe-Japan1		;
--%/TBRyokanG-B		/Adobe-Japan1		;
--%/TBRyokanG-DB		/Adobe-Japan1		;
--%/TBRyokanG-E		/Adobe-Japan1		;
--%/TBRyokanG-hv		/Adobe-Japan1		;
--%/TBRyokanG-M		/Adobe-Japan1		;
--%/TBRyokanG-R		/Adobe-Japan1		;
--%/TBRyokanM-DE		/Adobe-Japan1		;
--%/TBRyokanM-E		/Adobe-Japan1		;
--%/TBRyokanM-hv		/Adobe-Japan1		;
--%/TBRyokanM-M		/Adobe-Japan1		;
--%/TBTsukijiG-B		/Adobe-Japan1		;
--%/TBTsukijiG-DB		/Adobe-Japan1		;
--%/TBTsukijiG-E		/Adobe-Japan1		;
--%/TBTsukijiG-hv		/Adobe-Japan1		;
--%/TBTsukijiG-M		/Adobe-Japan1		;
--%/TBTsukijiG-R		/Adobe-Japan1		;
--%/TBTsukijiM-DE		/Adobe-Japan1		;
--%/TBTsukijiM-E		/Adobe-Japan1		;
--%/TBTsukijiM-hv		/Adobe-Japan1		;
--%/TBTsukijiM-M		/Adobe-Japan1		;
--%/TBYukinariG-B		/Adobe-Japan1		;
--%/TBYukinariG-DB	/Adobe-Japan1		;
--%/TBYukinariG-E		/Adobe-Japan1		;
--%/TBYukinariG-hv	/Adobe-Japan1		;
--%/TBYukinariG-M		/Adobe-Japan1		;
--%/TBYukinariG-R		/Adobe-Japan1		;
--%/TBYukinariM-DE	/Adobe-Japan1		;
--%/TBYukinariM-E		/Adobe-Japan1		;
--%/TBYukinariM-hv	/Adobe-Japan1		;
--%/TBYukinariM-M		/Adobe-Japan1		;
--%/TypeBankG-B		/Adobe-Japan1		;
--%/TypeBankG-DB		/Adobe-Japan1		;
--%/TypeBankG-E		/Adobe-Japan1		;
--%/TypeBankG-hv		/Adobe-Japan1		;
--%/TypeBankG-M		/Adobe-Japan1		;
--%/TypeBankG-R		/Adobe-Japan1		;
--%/TypeBankM-DE		/Adobe-Japan1		;
--%/TypeBankM-E		/Adobe-Japan1		;
--%/TypeBankM-hv		/Adobe-Japan1		;
--%/TypeBankM-M		/Adobe-Japan1		;
-+/Ryumin-Medium		/Ryumin-Light		;
-+/Ryumin-regular		/Ryumin-Light		;
-+/Ryumin-Ultra		/Ryumin-Light		;
-+/ShinGo-Bold		/GothicBBB-Medium	;
-+/ShinGo-Light		/GothicBBB-Medium	;
-+/ShinGo-Medium		/GothicBBB-Medium	;
-+/ShinGo-regular		/GothicBBB-Medium	;
-+/ShinGo-Ultra		/GothicBBB-Medium	;
-+/ShinseiKai-CBSK1	/Ryumin-Light		;
-+/TBKomachiG-B		/Adobe-Japan1		;
-+/TBKomachiG-DB		/Adobe-Japan1		;
-+/TBKomachiG-E		/Adobe-Japan1		;
-+/TBKomachiG-hv		/Adobe-Japan1		;
-+/TBKomachiG-M		/Adobe-Japan1		;
-+/TBKomachiG-R		/Adobe-Japan1		;
-+/TBKomachiM-DE		/Adobe-Japan1		;
-+/TBKomachiM-E		/Adobe-Japan1		;
-+/TBKomachiM-hv		/Adobe-Japan1		;
-+/TBKomachiM-M		/Adobe-Japan1		;
-+/TBKoudoukenG-B		/Adobe-Japan1		;
-+/TBKoudoukenG-DB	/Adobe-Japan1		;
-+/TBKoudoukenG-E		/Adobe-Japan1		;
-+/TBKoudoukenG-hv	/Adobe-Japan1		;
-+/TBKoudoukenG-M		/Adobe-Japan1		;
-+/TBKoudoukenG-R		/Adobe-Japan1		;
-+/TBKoudoukenM-DE	/Adobe-Japan1		;
-+/TBKoudoukenM-E		/Adobe-Japan1		;
-+/TBKoudoukenM-hv	/Adobe-Japan1		;
-+/TBKoudoukenM-M		/Adobe-Japan1		;
-+/TBRyokanG-B		/Adobe-Japan1		;
-+/TBRyokanG-DB		/Adobe-Japan1		;
-+/TBRyokanG-E		/Adobe-Japan1		;
-+/TBRyokanG-hv		/Adobe-Japan1		;
-+/TBRyokanG-M		/Adobe-Japan1		;
-+/TBRyokanG-R		/Adobe-Japan1		;
-+/TBRyokanM-DE		/Adobe-Japan1		;
-+/TBRyokanM-E		/Adobe-Japan1		;
-+/TBRyokanM-hv		/Adobe-Japan1		;
-+/TBRyokanM-M		/Adobe-Japan1		;
-+/TBTsukijiG-B		/Adobe-Japan1		;
-+/TBTsukijiG-DB		/Adobe-Japan1		;
-+/TBTsukijiG-E		/Adobe-Japan1		;
-+/TBTsukijiG-hv		/Adobe-Japan1		;
-+/TBTsukijiG-M		/Adobe-Japan1		;
-+/TBTsukijiG-R		/Adobe-Japan1		;
-+/TBTsukijiM-DE		/Adobe-Japan1		;
-+/TBTsukijiM-E		/Adobe-Japan1		;
-+/TBTsukijiM-hv		/Adobe-Japan1		;
-+/TBTsukijiM-M		/Adobe-Japan1		;
-+/TBYukinariG-B		/Adobe-Japan1		;
-+/TBYukinariG-DB		/Adobe-Japan1		;
-+/TBYukinariG-E		/Adobe-Japan1		;
-+/TBYukinariG-hv		/Adobe-Japan1		;
-+/TBYukinariG-M		/Adobe-Japan1		;
-+/TBYukinariG-R		/Adobe-Japan1		;
-+/TBYukinariM-DE		/Adobe-Japan1		;
-+/TBYukinariM-E		/Adobe-Japan1		;
-+/TBYukinariM-hv		/Adobe-Japan1		;
-+/TBYukinariM-M		/Adobe-Japan1		;
-+/TypeBankG-B		/Adobe-Japan1		;
-+/TypeBankG-DB		/Adobe-Japan1		;
-+/TypeBankG-E		/Adobe-Japan1		;
-+/TypeBankG-hv		/Adobe-Japan1		;
-+/TypeBankG-M		/Adobe-Japan1		;
-+/TypeBankG-R		/Adobe-Japan1		;
-+/TypeBankM-DE		/Adobe-Japan1		;
-+/TypeBankM-E		/Adobe-Japan1		;
-+/TypeBankM-hv		/Adobe-Japan1		;
-+/TypeBankM-M		/Adobe-Japan1		;
- 
- %
- % Convenient aliases for PS files on Korean Acrobat Distiller
- %
--%/AppleGothic		/HYGoThic-Medium	;
--%/AppleMyungjo		/HYSMyeongJo-Medium	;
--%/HYSinMyeongJo-Medium	/HYSMyeongJo-Medium	;
--%/JCfg			/Adobe-Korea1		;
--%/JCkg			/Adobe-Korea1		;
--%/Munhwa-Regular	/HYSMyeongJo-Medium	;
--%/MunhwaGothic-Regular	/HYGoThic-Medium	;
--%/SMAgoJ		/HYGoThic-Medium	;
--%/SMAgoK		/HYGoThic-Medium	;
--%/SMAgoSE		/HYGoThic-Medium	;
--%/SMAgoT		/HYGoThic-Medium	;
--%/SMAmu			/HYSMyeongJo-Medium	;
--%/SMAmuK		/HYSMyeongJo-Medium	;
--%/SMAmuSE		/HYSMyeongJo-Medium	;
--%/SMAmuT		/HYSMyeongJo-Medium	;
--%/SMGothic-Bold		/HYGoThic-Medium	;
--%/SMGothic-DemiBold	/HYGoThic-Medium	;
--%/SMGothic-Light	/HYGoThic-Medium	;
--%/SMGothic-Medium	/HYGoThic-Medium	;
--%/SMMyungjo-Bold	/HYSMyeongJo-Medium	;
--%/SMMyungjo-DemiBold	/HYSMyeongJo-Medium	;
--%/SMMyungjo-Light	/HYSMyeongJo-Medium	;
--%/SMMyungjo-Medium	/HYSMyeongJo-Medium	;
--%/SMgoJ			/HYGoThic-Medium	;
--%/SMgoK			/HYGoThic-Medium	;
--%/SMgoSE		/HYGoThic-Medium	;
--%/SMgoT			/HYGoThic-Medium	;
--%/SMmu			/HYSMyeongJo-Medium	;
--%/SMmuK			/HYSMyeongJo-Medium	;
--%/SMmuSE		/HYSMyeongJo-Medium	;
--%/SMmuT			/HYSMyeongJo-Medium	;
--%/Seoul			/Adobe-Korea1		;
-+/AppleGothic		/HYGoThic-Medium	;
-+/AppleMyungjo		/HYSMyeongJo-Medium	;
-+/HYSinMyeongJo-Medium	/HYSMyeongJo-Medium	;
-+/JCfg			/Adobe-Korea1		;
-+/JCkg			/Adobe-Korea1		;
-+/Munhwa-Regular		/HYSMyeongJo-Medium	;
-+/MunhwaGothic-Regular	/HYGoThic-Medium	;
-+/SMAgoJ			/HYGoThic-Medium	;
-+/SMAgoK			/HYGoThic-Medium	;
-+/SMAgoSE		/HYGoThic-Medium	;
-+/SMAgoT			/HYGoThic-Medium	;
-+/SMAmu			/HYSMyeongJo-Medium	;
-+/SMAmuK			/HYSMyeongJo-Medium	;
-+/SMAmuSE		/HYSMyeongJo-Medium	;
-+/SMAmuT			/HYSMyeongJo-Medium	;
-+/SMGothic-Bold		/HYGoThic-Medium	;
-+/SMGothic-DemiBold	/HYGoThic-Medium	;
-+/SMGothic-Light		/HYGoThic-Medium	;
-+/SMGothic-Medium	/HYGoThic-Medium	;
-+/SMMyungjo-Bold		/HYSMyeongJo-Medium	;
-+/SMMyungjo-DemiBold	/HYSMyeongJo-Medium	;
-+/SMMyungjo-Light	/HYSMyeongJo-Medium	;
-+/SMMyungjo-Medium	/HYSMyeongJo-Medium	;
-+/SMgoJ			/HYGoThic-Medium	;
-+/SMgoK			/HYGoThic-Medium	;
-+/SMgoSE			/HYGoThic-Medium	;
-+/SMgoT			/HYGoThic-Medium	;
-+/SMmu			/HYSMyeongJo-Medium	;
-+/SMmuK			/HYSMyeongJo-Medium	;
-+/SMmuSE			/HYSMyeongJo-Medium	;
-+/SMmuT			/HYSMyeongJo-Medium	;
-+/Seoul			/Adobe-Korea1		;
-diff -Naur espgs-7.05.6.orig/lib/CIDFnmap.Koc espgs-7.05.6/lib/CIDFnmap.Koc
---- espgs-7.05.6.orig/lib/CIDFnmap.Koc	2002-04-23 20:58:33.000000000 +0900
-+++ espgs-7.05.6/lib/CIDFnmap.Koc	2003-01-09 02:27:55.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	(/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho.ttf)	;
-+/Kochi-Gothic	(/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic.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 -Naur espgs-7.05.6.orig/lib/gs_res.ps.in espgs-7.05.6/lib/gs_res.ps.in
---- espgs-7.05.6.orig/lib/gs_res.ps.in	2002-12-28 07:01:36.000000000 +0900
-+++ espgs-7.05.6/lib/gs_res.ps.in	2002-12-28 07:03:20.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/files/gs7.05.6-cjk.diff.bz2 b/app-text/ghostscript/files/gs7.05.6-cjk.diff.bz2
new file mode 100644
index 000000000000..1d1c2850c3dc
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.05.6-cjk.diff.bz2
diff --git a/app-text/ghostscript/files/gs7.07.1-fontconfig-rh.patch.bz2 b/app-text/ghostscript/files/gs7.07.1-fontconfig-rh.patch.bz2
new file mode 100644
index 000000000000..cb7ea8f7e5f4
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.07.1-fontconfig-rh.patch.bz2
diff --git a/app-text/ghostscript/ghostscript-7.05.6.ebuild b/app-text/ghostscript/ghostscript-7.05.6.ebuild
index 1333a8353f79..1e75dd2dd132 100644
--- a/app-text/ghostscript/ghostscript-7.05.6.ebuild
+++ b/app-text/ghostscript/ghostscript-7.05.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.05.6.ebuild,v 1.15 2004/07/13 21:15:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.05.6.ebuild,v 1.16 2004/08/04 16:10:14 lanius Exp $
 
 inherit eutils
 
@@ -38,14 +38,15 @@ src_unpack() {
 	unpack gnu-gs-fonts-other-6.0.tar.gz
 
 	# Brother HL-12XX support
-	cp ${FILESDIR}/gs7.05-gdevhl12.c ${S}/src/gdevhl12.c || die
+	cp ${FILESDIR}/gs7.05-gdevhl12.c.bz2 ${S}/src/gdevhl12.c.bz2 || die
+	bzip2 -d ${S}/src/gdevhl12.c.bz2 || die
 	mv ${S}/src/Makefile.in ${S}/src/Makefile.in.orig
 	sed 's#^\(DEVICE_DEVS6=.*\)$#\1 $(DD)hl1240.dev $(DD)hl1250.dev#' \
 		${S}/src/Makefile.in.orig > ${S}/src/Makefile.in || die
 
 ##	patch -p0 < ${FILESDIR}/png.diff || die "patch failed"
 
-	use cjk && epatch ${FILESDIR}/gs${PV}-cjk.diff
+	use cjk && epatch ${FILESDIR}/gs${PV}-cjk.diff.bz2
 
 	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
 	patch -p0 ${S}/man/gs.1 < ${FILESDIR}/${P}.man.patch || die
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r1.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r1.ebuild
index 783810fc5f90..78a896f89e8b 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r1.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r1.ebuild,v 1.12 2004/07/01 11:57:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r1.ebuild,v 1.13 2004/08/04 16:10:14 lanius Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -38,7 +38,7 @@ src_unpack() {
 	cd ${S}
 
 	if use cjk ; then
-		epatch ${FILESDIR}/gs7.05.6-cjk.diff
+		epatch ${FILESDIR}/gs7.05.6-cjk.diff.bz2
 		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
 	fi
 
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r2.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r2.ebuild
index bf0987c90780..be1be1236bd4 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r2.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r2.ebuild,v 1.10 2004/07/01 11:57:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r2.ebuild,v 1.11 2004/08/04 16:10:14 lanius Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -38,7 +38,7 @@ src_unpack() {
 	cd ${S}
 
 	if use cjk ; then
-		epatch ${FILESDIR}/gs7.05.6-cjk.diff
+		epatch ${FILESDIR}/gs7.05.6-cjk.diff.bz2
 		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
 	fi
 
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r3.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r3.ebuild
index 4f920b4d8466..d2fd3ae0c3a7 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r3.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r3.ebuild,v 1.2 2004/07/27 02:29:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r3.ebuild,v 1.3 2004/08/04 16:10:14 lanius Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -38,7 +38,7 @@ src_unpack() {
 	cd ${S}
 
 	if use cjk ; then
-		epatch ${FILESDIR}/gs7.05.6-cjk.diff
+		epatch ${FILESDIR}/gs7.05.6-cjk.diff.bz2
 		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
 	fi
 
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild
new file mode 100644
index 000000000000..28cd11bdf742
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild,v 1.1 2004/08/04 16:10:14 lanius Exp $
+
+inherit flag-o-matic eutils gcc
+
+DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
+HOMEPAGE="http://www.cups.org/ghostscript.php"
+SRC_URI="mirror://sourceforge/espgs/espgs-${PV}-source.tar.bz2
+	ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ghostscript-fonts-std-8.11.tar.gz
+	cjk? ( http://www.matsusaka-u.ac.jp/mirror/gs-cjk/adobe-cmaps-200204.tar.gz
+		http://www.matsusaka-u.ac.jp/mirror/gs-cjk/acro5-cmaps-2001.tar.gz)"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~ia64 ~x86 -ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ppc64"
+IUSE="X cups cjk emacs truetype"
+
+DEPEND="virtual/libc
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	>=sys-libs/zlib-1.1.4
+	X? ( virtual/x11 )
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
+	cups? ( net-print/cups )
+	!virtual/ghostscript
+	truetype? ( media-libs/fontconfig )"
+
+S=${WORKDIR}/espgs-${PV}
+
+PROVIDE="virtual/ghostscript"
+
+src_unpack() {
+	unpack espgs-${PV}-source.tar.bz2
+	unpack ghostscript-fonts-std-8.11.tar.gz
+
+	cd ${S}
+
+	if use cjk ; then
+		epatch ${FILESDIR}/gs7.05.6-cjk.diff.bz2
+		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
+	fi
+
+	# add fontconfig support
+	use truetype && epatch ${FILESDIR}/gs7.07.1-fontconfig-rh.patch.bz2
+
+	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
+	epatch ${FILESDIR}/ghostscript-7.05.6.man.patch
+
+	# pxl dash patch
+	epatch ${FILESDIR}/gs${PV}-ps2epsi.patch
+
+	# ijs fPIC patch
+	epatch ${FILESDIR}/gs${PV}-ijs.patch
+
+	# pxl dash patch
+	epatch ${FILESDIR}/gs7.05.6-gdevpx.patch
+
+	# search path fix
+	sed -i -e 's:$(gsdatadir)/lib:/usr/share/ghostscript/7.07/lib:' Makefile.in
+	sed -i -e 's:$(gsdir)/fonts:/usr/share/ghostscript/fonts:' Makefile.in
+
+	# krgb support
+	cd src
+	epatch ${FILESDIR}/gs7.07.1-krgb.patch.gz
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --with-omni --without-gimp-print"
+
+	use X && myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x"
+
+	use cups && myconf="${myconf} --enable-cups" \
+		|| myconf="${myconf} --disable-cups"
+
+	# -O3 will make ghostscript fail when compiling with gcc 3.4
+	if [ "`gcc-major-version`" -eq "3" ] && [ "`gcc-minor-version`" -eq "4" ]
+	then
+		strip-flags
+		replace-flags -O? -O2
+	fi
+
+	autoconf
+	econf ${myconf} || die "econf failed"
+	make || die "make failed"
+
+	cd ijs
+	econf --prefix=${D}/usr || die "econf failed"
+	make || die "make failed"
+	cd ..
+}
+
+src_install() {
+	einstall install_prefix=${D}
+
+	cd ${WORKDIR}
+	cp -a fonts ${D}/usr/share/ghostscript || die
+	cd ${S}
+
+	rm -fr ${D}/usr/share/ghostscript/7.07/doc || die
+	dodoc doc/README doc/COPYING doc/COPYING.LGPL
+	dohtml doc/*.html doc/*.htm
+
+	if use emacs; then
+		insinto /usr/share/emacs/site-lisp
+		doins doc/gsdoc.el
+	fi
+
+	if use cjk ; then
+		dodir /usr/share/ghostscript/Resource
+		dodir /usr/share/ghostscript/Resource/Font
+		dodir /usr/share/ghostscript/Resource/CIDFont
+		cd ${D}/usr/share/ghostscript/Resource
+		unpack adobe-cmaps-200204.tar.gz
+		unpack acro5-cmaps-2001.tar.gz
+	fi
+
+	# Install ijs
+	cd ${S}/ijs
+	dodir /usr/bin /usr/include /usr/lib
+	# This is broken - there are not even a 'install_prefix'
+	# anywhere in ${S}/ijs ...
+	#einstall install_prefix=${D}
+	einstall
+	dosed "s:^prefix=.*:prefix=/usr:" /usr/bin/ijs-config
+}