version bump thanks to Didier Link <didier.link@wanadoo.fr> in bug 152144

(Portage version: 2.1.2_pre3-r6)
 (Unsigned Manifest commit)

6 files changed, 29 insertions, 591 deletions

diff --git a/app-text/ghostscript-gnu/Manifest b/app-text/ghostscript-gnu/Manifest
index 0c9a627ce210..120e11cb658a 100644
--- a/app-text/ghostscript-gnu/Manifest
+++ b/app-text/ghostscript-gnu/Manifest
@@ -1,31 +1,35 @@
-AUX ghostscript-fontconfig.patch 8038 RMD160 6283cc2cbc18927486afce71d4e8f1d77fb069ee SHA1 471bf4f46e48257d67c5580e6e44c483c2450654 SHA256 f9040bf7372682814c5c96ca3312cc57c2b9a278a5331013526d93dabecc7d58
-MD5 ab4b73dfa08b2dc4b421e3d8f0a36f74 files/ghostscript-fontconfig.patch 8038
-RMD160 6283cc2cbc18927486afce71d4e8f1d77fb069ee files/ghostscript-fontconfig.patch 8038
-SHA256 f9040bf7372682814c5c96ca3312cc57c2b9a278a5331013526d93dabecc7d58 files/ghostscript-fontconfig.patch 8038
+AUX gdevcups.patch 14468 RMD160 957e089ff3c85bec4412fa876570503eeedab167 SHA1 23798ea3a739b71fadcf9066b27ad6f3b4c1c608 SHA256 6759754addb447874b682f99058e3f620819814ae51ca24b97c2d70452f98869
+MD5 8b3c391af1131b4fce97bef3659e57d3 files/gdevcups.patch 14468
+RMD160 957e089ff3c85bec4412fa876570503eeedab167 files/gdevcups.patch 14468
+SHA256 6759754addb447874b682f99058e3f620819814ae51ca24b97c2d70452f98869 files/gdevcups.patch 14468
+AUX ghostscript-afpl-8.54-cups-destdir.diff 699 RMD160 290c2f81a51d1656f0f0907fb061170595938964 SHA1 8b5327ed8b7726cd103a13094a6aac9907fc226f SHA256 d739789264b0051a52764e68af298cd5da0edaa8e65fb909f022b0fc44fc5f56
+MD5 c75892c93d1df123f1a1c84fed8df9c6 files/ghostscript-afpl-8.54-cups-destdir.diff 699
+RMD160 290c2f81a51d1656f0f0907fb061170595938964 files/ghostscript-afpl-8.54-cups-destdir.diff 699
+SHA256 d739789264b0051a52764e68af298cd5da0edaa8e65fb909f022b0fc44fc5f56 files/ghostscript-afpl-8.54-cups-destdir.diff 699
+AUX ghostscript-esp-8.15.2-FAPIcidfmap.cjk 2902 RMD160 a248b8db74aefe41d548c3712dc6603975a09698 SHA1 8a63a7cbe94414343154594a709c886b3c0ab712 SHA256 3ec8e039c1cbb94043d2b79e7d3d84016595804f27d67bb251eba2c33611ccab
+MD5 ddd297dd9f783163b0f13ec97dcb13bc files/ghostscript-esp-8.15.2-FAPIcidfmap.cjk 2902
+RMD160 a248b8db74aefe41d548c3712dc6603975a09698 files/ghostscript-esp-8.15.2-FAPIcidfmap.cjk 2902
+SHA256 3ec8e039c1cbb94043d2b79e7d3d84016595804f27d67bb251eba2c33611ccab files/ghostscript-esp-8.15.2-FAPIcidfmap.cjk 2902
+AUX ghostscript-esp-8.15.2-cidfmap.cjk 2095 RMD160 8e1b461f58df3282768c20b988312ec37cf3bbdf SHA1 698a7b5c8958c49ea8e72ab131da1846a022ccd3 SHA256 1773c5e7f0f7088434d7a1cc8e27850225b57500cf9f8f2f6ea0f266daedaf5c
+MD5 b3d8b5d824f41ce4fd5416940aca2b89 files/ghostscript-esp-8.15.2-cidfmap.cjk 2095
+RMD160 8e1b461f58df3282768c20b988312ec37cf3bbdf files/ghostscript-esp-8.15.2-cidfmap.cjk 2095
+SHA256 1773c5e7f0f7088434d7a1cc8e27850225b57500cf9f8f2f6ea0f266daedaf5c files/ghostscript-esp-8.15.2-cidfmap.cjk 2095
 DIST acro5-cmaps-2001.tar.gz 631653 RMD160 c723afc2207157a434988b46bcf0a458281c29a4 SHA1 fbc8715eae880f59e2251ae8fa99f79fbcfbd3e5 SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4
-DIST adobe-cmaps-200204.tar.gz 4360486 RMD160 14f436cb2869788f249c0eaf5dd6a31295c5ada7 SHA256 510f29086630db1a581ab77e46c3a6b9b4ee4bf8c7717c209e5125794a59480a
-DIST cups-1.1.20-source.tar.bz2 3741510 RMD160 cd50b2f250f4514c946941900387b36b9c2b9491 SHA256 d3c84d0ae02d1784cd063cacf34ae142a361428f053cb589c0c22b2169c07f2b
+DIST adobe-cmaps-200406.tar.gz 5001983 RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 SHA1 b846292af4541d907dd9041e397c2f1d8c72a056 SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
-DIST gnu-ghostscript-8.16.tar.gz 6633085 RMD160 05b1b15c21640b709658a2e0c07d6424705fd9ff SHA256 417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8
-EBUILD ghostscript-gnu-8.16-r1.ebuild 3445 RMD160 96073edefdc12a3c46e346b6e743e048e434324e SHA1 2ee16e906dfb946fc521f4d71810f8ecc84ff8a9 SHA256 a4e97e0e2410fdf7fd056d2b64cd6845a005f1fc6ea770fc89ed9e058b29e082
-MD5 5eff98d1ea5c3bdfab05aa86cc825791 ghostscript-gnu-8.16-r1.ebuild 3445
-RMD160 96073edefdc12a3c46e346b6e743e048e434324e ghostscript-gnu-8.16-r1.ebuild 3445
-SHA256 a4e97e0e2410fdf7fd056d2b64cd6845a005f1fc6ea770fc89ed9e058b29e082 ghostscript-gnu-8.16-r1.ebuild 3445
-EBUILD ghostscript-gnu-8.16-r3.ebuild 4561 RMD160 18ea924c74cb8975e7c9e31b5c3e3c4408d53b9e SHA1 4089b8a6cb97579d0a87558b9fe6c345e26209e1 SHA256 a30f1a416f60a997b9ee19c2ceb9d788007f3d611845935161c33a9a359b13a8
-MD5 77df859e61ef5579494ac03d136a93d7 ghostscript-gnu-8.16-r3.ebuild 4561
-RMD160 18ea924c74cb8975e7c9e31b5c3e3c4408d53b9e ghostscript-gnu-8.16-r3.ebuild 4561
-SHA256 a30f1a416f60a997b9ee19c2ceb9d788007f3d611845935161c33a9a359b13a8 ghostscript-gnu-8.16-r3.ebuild 4561
-MISC ChangeLog 4076 RMD160 f1a8ac4521eda6aaedea6597062dd8e26bddb424 SHA1 571a67cfb047f41aefc5ecd008a54a2ae4594179 SHA256 107a091f0e27ba5c33698de7f47fe96cfdd739a26dd3a8cd2c09d78f02e383ba
-MD5 dcc25a121da41f7b54ce2d4857df0e26 ChangeLog 4076
-RMD160 f1a8ac4521eda6aaedea6597062dd8e26bddb424 ChangeLog 4076
-SHA256 107a091f0e27ba5c33698de7f47fe96cfdd739a26dd3a8cd2c09d78f02e383ba ChangeLog 4076
+DIST gnu-ghostscript-8.55.tar.bz2 7947779 RMD160 b87371aaffe8c25f49c8d3b62bb84e397bef3b2f SHA1 4ea469402a6e126757494c1182bb749bf76643e9 SHA256 8812a1b9643e79487a7d598b27082224784e176c8c6ca0190187b2dc2b1a1751
+EBUILD ghostscript-gnu-8.55.ebuild 3668 RMD160 4d9c70fc56a264544320c79cb362174d34e8d03b SHA1 9ca731b2dbc655537e76b221ef66ed759b38609c SHA256 00a386598e979a74473584850496cfa38be44971fbb09ef130f54fc4c3c0d45f
+MD5 3490a3fce72e7f7cb742b58dd90029a9 ghostscript-gnu-8.55.ebuild 3668
+RMD160 4d9c70fc56a264544320c79cb362174d34e8d03b ghostscript-gnu-8.55.ebuild 3668
+SHA256 00a386598e979a74473584850496cfa38be44971fbb09ef130f54fc4c3c0d45f ghostscript-gnu-8.55.ebuild 3668
+MISC ChangeLog 4547 RMD160 ae10735e4f755663caf0ef5447f1547a1dfd844d SHA1 cdc9e3d99b3ca0f0e5cd0d783463e250eec587fb SHA256 e81fbde83f62cd9ca8ddbb76fee6c3502c301da234677ca97a31d81e47f8d19f
+MD5 7f4a76fa8ff963f322792a907b39fc59 ChangeLog 4547
+RMD160 ae10735e4f755663caf0ef5447f1547a1dfd844d ChangeLog 4547
+SHA256 e81fbde83f62cd9ca8ddbb76fee6c3502c301da234677ca97a31d81e47f8d19f ChangeLog 4547
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 cb0578fcb91d25ea9f25f507ff66984d files/digest-ghostscript-gnu-8.16-r1 1036
-RMD160 c8f9555ce939b65a8eead3f909e24d863edebc27 files/digest-ghostscript-gnu-8.16-r1 1036
-SHA256 f676e6a352510f4baac16dfd0d8917804f2cd6aee6581b4488f9484021108c99 files/digest-ghostscript-gnu-8.16-r1 1036
-MD5 2786598cab8f512dba3e0dee0ad3b9d9 files/digest-ghostscript-gnu-8.16-r3 1036
-RMD160 c931dd938c0a0f29496d3e07b2a1ac4bb4442a9b files/digest-ghostscript-gnu-8.16-r3 1036
-SHA256 bbb57fe48e4249ab2bb7fdec84715265264af8b56b65f3afd208ca473a009532 files/digest-ghostscript-gnu-8.16-r3 1036
+MD5 2149cec4a24791c0d55ffb8b40ead7d5 files/digest-ghostscript-gnu-8.55 1039
+RMD160 4115ebe6ebbabf39d4ea883c54440e19ecabce17 files/digest-ghostscript-gnu-8.55 1039
+SHA256 2b693f6aabf944f9be5d3745c92d9b9f4c20fea89c66d365f3c12ad7ce1b6e19 files/digest-ghostscript-gnu-8.55 1039
diff --git a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r1 b/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r1
deleted file mode 100644
index 1da41a8e2319..000000000000
--- a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r1
+++ /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 09d0be2bad1b0617bc0eba6eef81f6e9 cups-1.1.20-source.tar.bz2 3741510
-RMD160 cd50b2f250f4514c946941900387b36b9c2b9491 cups-1.1.20-source.tar.bz2 3741510
-SHA256 d3c84d0ae02d1784cd063cacf34ae142a361428f053cb589c0c22b2169c07f2b cups-1.1.20-source.tar.bz2 3741510
-MD5 c42dfaebc37fe81eab0b5676b124ab63 gnu-ghostscript-8.16.tar.gz 6633085
-RMD160 05b1b15c21640b709658a2e0c07d6424705fd9ff gnu-ghostscript-8.16.tar.gz 6633085
-SHA256 417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 gnu-ghostscript-8.16.tar.gz 6633085
diff --git a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r3 b/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r3
deleted file mode 100644
index 844c0dae75ad..000000000000
--- a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r3
+++ /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 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
-RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 cups-1.1.23-source.tar.bz2 8705521
-SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e cups-1.1.23-source.tar.bz2 8705521
-MD5 c42dfaebc37fe81eab0b5676b124ab63 gnu-ghostscript-8.16.tar.gz 6633085
-RMD160 05b1b15c21640b709658a2e0c07d6424705fd9ff gnu-ghostscript-8.16.tar.gz 6633085
-SHA256 417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 gnu-ghostscript-8.16.tar.gz 6633085
diff --git a/app-text/ghostscript-gnu/files/ghostscript-fontconfig.patch b/app-text/ghostscript-gnu/files/ghostscript-fontconfig.patch
deleted file mode 100644
index cb2c62888373..000000000000
--- a/app-text/ghostscript-gnu/files/ghostscript-fontconfig.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-? autom4te.cache
-? fontconfig-patch-0.diff
-? fontconfig-patch-1.diff
-? fontconfig-patch-2.diff
-? fontconfig-patch-3.diff
-? fontconfig-patch-4.diff
-? loadall.log
-? loadall.ps
-? native.ps
-? test.ps
-? src/gp_unix_fc.c
-? src/gp_unix_nofc.c
-Index: src/configure.ac
-===================================================================
---- src/configure.ac.orig
-+++ src/configure.ac
-@@ -27,11 +27,9 @@ dnl ------------------------------------
- dnl Initialization and Versioning
- dnl ------------------------------------------------
- 
--AC_INIT
- AC_PREREQ(2.52)
- AC_INIT(gnu-ghostscript, 8.16, didier.link@wanadoo.fr)
- AC_CONFIG_SRCDIR(src/gs.c)
--AM_INIT_AUTOMAKE
- 
- dnl TOPDIR=`pwd`
- 
-@@ -345,6 +343,13 @@ AC_ARG_ENABLE(compile-inits, AC_HELP_STR
-                fi])
- AC_SUBST(COMPILE_INITS)
- 
-+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 library functions
- dnl --------------------------------------------------
-Index: src/gp_unix.c
-===================================================================
---- src/gp_unix.c.orig
-+++ src/gp_unix.c
-@@ -30,6 +30,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.
-@@ -182,16 +188,193 @@ gp_close_printer(FILE * pfile, const cha
-   * 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
-+}
-+
-Index: src/Makefile.in
-===================================================================
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -253,7 +253,7 @@ LDFLAGS=@LDFLAGS@ $(XLDFLAGS)
- # Solaris may need -lnsl -lsocket -lposix4.
- # (Libraries required by individual drivers are handled automatically.)
- 
--EXTRALIBS=
-+EXTRALIBS=@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-gnu/ghostscript-gnu-8.16-r1.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r1.ebuild
deleted file mode 100644
index f6df79d3af5d..000000000000
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r1.ebuild,v 1.14 2006/08/12 22:06:22 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/ghostscript/"
-
-MY_PN="gnu-ghostscript"
-MY_P=${MY_PN}-${PV}
-CUPS_PV=1.1.20
-
-SRC_URI="ftp://ftp.gnu.org/gnu/ghostscript/${MY_P}.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 )
-	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="X cups cjk gtk"
-
-DEPEND="virtual/libc
-	media-libs/tiff
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.5
-	>=sys-libs/zlib-1.2.0
-	X? ( || ( x11-libs/libXt virtual/x11 ) )
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
-	cups? ( >=net-print/cups-1.1.20 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	media-fonts/gnu-gs-fonts-std"
-
-RDEPEND="X? ( || ( (	x11-libs/libXt
-			x11-libs/libXi )
-	virtual/x11 ) )
-	media-libs/tiff
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.5
-	>=sys-libs/zlib-1.2.0
-	cups? ( >=net-print/cups-1.1.20 )
-	!app-text/ghostscript-gpl
-	!app-text/ghostscript-esp"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	# cups support
-	if use cups; then
-		unpack cups-${CUPS_PV}-source.tar.bz2
-		cp -r cups-${CUPS_PV}/pstoraster ${S}
-		cd ${S}/pstoraster
-		sed -e 's:@prefix@:/usr:' -e 's:@exec_prefix@:${prefix}:' -e 's:@bindir@:${exec_prefix}/bin:' -e 's:@GS@:gs:' pstopxl.in > pstopxl
-		sed -i -e 's:/usr/local:/usr:' pstoraster
-		sed -i -e "s:pstopcl6:pstopxl:" cups.mak
-		cd ..
-		epatch pstoraster/gs811-lib.patch
-	fi
-
-	# enable cfax device
-	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev $(DD)cfax.dev:' ${S}/Makefile.in
-}
-
-src_compile() {
-	myconf="--with-ijs"
-
-	use X && myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	# don't build gtk frontend if not in use
-	use gtk || sed -i -e 's:$(INSTALL_PROGRAM) $(GSSOX):#:' src/unix-dll.mak \
-		-e 's:$(GSSOX)::' src/unix-dll.mak
-
-	econf ${myconf} || die "econf failed"
-
-	# build cups driver with cups
-	if use cups; then
-		echo 'include pstoraster/cups.mak' >> Makefile
-		sed -i -e 's:DEVICE_DEVS17=:DEVICE_DEVS17=$(DD)cups.dev:' Makefile
-		sed -i -e 's:EXTRALIBS=\(.*\):EXTRALIBS=\1 -lcups -lcupsimage:' Makefile
-	fi
-
-	# search path fix
-	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' Makefile
-
-	make || die "make failed"
-	make so || die "make so failed"
-
-	# build ijs
-	cd ijs
-	libtoolize --copy --force
-	econf || die "econf failed"
-	make || die "make failed"
-	cd ..
-}
-
-src_install() {
-	einstall D=/ install_prefix=${D} soinstall
-
-	rm -fr ${D}/usr/share/ghostscript/${PV}/doc || die
-	dodoc doc/README
-	dohtml doc/*.html doc/*.htm
-	insinto /usr/share/emacs/site-lisp
-	doins doc/gsdoc.el || die
-
-	if use cjk ; then
-		dodir /usr/share/ghostscript/${PV}/Resource
-		dodir /usr/share/ghostscript/${PV}/Resource/Font
-		dodir /usr/share/ghostscript/${PV}/Resource/CIDFont
-		cd ${D}/usr/share/ghostscript/${PV}/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
-	einstall D=/ install_prefix=${D}
-}
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r3.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r3.ebuild
deleted file mode 100644
index 0a16d4a5f45e..000000000000
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r3.ebuild,v 1.4 2006/08/12 22:06:22 genstef Exp $
-
-inherit eutils libtool autotools
-
-DESCRIPTION="GNU Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/ghostscript/"
-
-CUPS_PV=1.1.23
-MY_P=gnu-ghostscript-${PV}
-PVM=${PV%.[0-9]}
-SRC_URI="ftp://ftp.gnu.org/gnu/ghostscript/${MY_P}.tar.gz
-	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )
-	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"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X cups cjk emacs gtk"
-
-
-DEP=">=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.5
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.7
-	X? ( || ( x11-libs/libXt virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	cups? ( >=net-print/cups-1.1.20 )
-	media-libs/fontconfig
-	!app-text/ghostscript-gpl
-	!app-text/ghostscript-esp"
-
-RDEPEND="${DEP}
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
-	media-fonts/gnu-gs-fonts-std"
-
-DEPEND="${DEP}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	# cups support
-	if use cups; then
-		unpack cups-${CUPS_PV}-source.tar.bz2
-		cp -r cups-${CUPS_PV}/pstoraster ${S}
-		cd ${S}/pstoraster
-		sed -e 's:@prefix@:/usr:' -e 's:@exec_prefix@:${prefix}:' \
-			-e 's:@bindir@:${exec_prefix}/bin:' -e 's:@GS@:gs:' \
-			pstopxl.in > pstopxl || die "pstopxlsed failed"
-		sed -i -e 's:OUTPUTFILE="%stdout" $profile $6$:\0 -:' \
-			-e 's:/usr/local:/usr:' pstoraster || die "pstorastersed failed"
-		sed -i -e "s:pstopcl6:pstopxl:" cups.mak || die "cupssed failed"
-		cd ..
-		epatch pstoraster/gs811-lib.patch
-	fi
-
-	# enable cfax device (bug #56704)
-	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev $(DD)cfax.dev:' \
-		${S}/src/Makefile.in || die "sed failed"
-	cd ${S}
-
-	#epatch ${FILESDIR}/gs-${PV}destdir.patch
-	#epatch ${FILESDIR}/ghostscript-build.patch
-	#epatch ${FILESDIR}/ghostscript-scripts.patch
-	#epatch ${FILESDIR}/ghostscript-ps2epsi.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-badc.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-pagesize.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-noopt.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-use-external-freetype.patch
-	#epatch ${FILESDIR}/ghostscript-split-font-configuration.patch
-
-	# not submitted
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ijs-dirinstall.diff
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-gtk2.patch
-	if ! use gtk; then
-		sed -i "s:\$(GSSOX)::" src/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" src/*.mak || die "gsxso sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		src/Makefile.in || die "sed failed"
-	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
-		src/Makefile.in || die "sed failed"
-
-	epatch "${FILESDIR}/ghostscript-fontconfig.patch"
-
-	sed -i -e '/^AC_INIT$/d; /AM_/d' "${S}/src/configure.ac"
-
-	cp /usr/share/automake-1.9/install-sh "${S}"
-	eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-	myconf="--with-ijs --with-jbig2dec"
-
-	econf $(use_with X x) \
-		${myconf} || die "econf failed"
-
-	if use cups; then
-		echo 'include pstoraster/cups.mak' >> Makefile
-		sed -i -e 's:DEVICE_DEVS17=:DEVICE_DEVS17=$(DD)cups.dev:' Makefile || die "sed failed"
-		sed -i -e 's:EXTRALIBS=\(.*\):EXTRALIBS=\1 -lcups -lcupsimage:' Makefile || die "sed failed"
-	fi
-	emake -j1 || die "make failed"
-	emake so -j1 || die "make failed"
-
-	cd ijs
-	libtoolize --copy --force
-	econf || die "econf failed"
-	emake -j1 || die "make failed"
-	cd ..
-}
-
-src_install() {
-	einstall D=/ install_prefix=${D} soinstall
-
-	rm -fr ${D}/usr/share/ghostscript/${PVM}/doc || die
-	dodoc doc/README
-	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
-	make DESTDIR="${D}" install || die "ijs install failed"
-}