Version bump thanks to everyone in bug 74211, also fixes bug 81418

(Portage version: 2.0.53_rc7)

7 files changed, 705 insertions, 13 deletions

diff --git a/app-text/ghostscript-afpl/ChangeLog b/app-text/ghostscript-afpl/ChangeLog
index ba9b1a2b7e53..84c2bfa31560 100644
--- a/app-text/ghostscript-afpl/ChangeLog
+++ b/app-text/ghostscript-afpl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ghostscript-afpl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ChangeLog,v 1.28 2005/04/24 11:35:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ChangeLog,v 1.29 2005/11/02 00:29:49 genstef Exp $
+
+*ghostscript-afpl-8.53 (02 Nov 2005)
+
+  02 Nov 2005; Stefan Schweizer <genstef@gentoo.org> +files/gdevcups.patch,
+  +files/gs852-lib.patch, +files/rinkj.patch, +ghostscript-afpl-8.53.ebuild:
+  Version bump thanks to everyone in bug 74211, also fixes bug 81418
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   ghostscript-afpl-8.15.ebuild:
diff --git a/app-text/ghostscript-afpl/Manifest b/app-text/ghostscript-afpl/Manifest
index 9d836bf50c55..cd44795d1e28 100644
--- a/app-text/ghostscript-afpl/Manifest
+++ b/app-text/ghostscript-afpl/Manifest
@@ -1,15 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b662c27eb9c0bce8d365d1c081d5af54 ghostscript-afpl-8.15.ebuild 3347
 MD5 30c4036e945741afde50c748a43c7d7c ChangeLog 3354
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 e10b8f4566648e7bc09f6b7336d74b2d files/digest-ghostscript-afpl-8.15 280
+MD5 cc1e3a109091c74903b8607870a89016 files/digest-ghostscript-afpl-8.53 281
+MD5 888c60cf85cc900781da24ff001ce1c2 files/gdevcups.patch 24933
 MD5 dbdb3cd0aea8f9032baa11bc335d181a files/gs-8.11-ijs.patch 757
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCqEPAI1lqEGTUzyQRAjT3AJ9N1kZ9b5DRWPUoaMHLkDnPh8SdQQCeNb0A
-7sMVj0K1Z2zsPoY+CDk09wM=
-=m84B
------END PGP SIGNATURE-----
+MD5 0a7cbf3d9b9644442d7521969cdb9efd files/gs852-lib.patch 4045
+MD5 dbaa6966d91fc14f9460882e8686c44e files/rinkj.patch 1353
+MD5 b662c27eb9c0bce8d365d1c081d5af54 ghostscript-afpl-8.15.ebuild 3347
+MD5 7e9555592dca589537dc645df191ae3e ghostscript-afpl-8.53.ebuild 3563
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/app-text/ghostscript-afpl/files/digest-ghostscript-afpl-8.53 b/app-text/ghostscript-afpl/files/digest-ghostscript-afpl-8.53
new file mode 100644
index 000000000000..32f20b2ad2f9
--- /dev/null
+++ b/app-text/ghostscript-afpl/files/digest-ghostscript-afpl-8.53
@@ -0,0 +1,4 @@
+MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
+MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
+MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
+MD5 7b2fca7021a093ce593c04332bcbdfb2 ghostscript-8.53.tar.gz 11745494
diff --git a/app-text/ghostscript-afpl/files/gdevcups.patch b/app-text/ghostscript-afpl/files/gdevcups.patch
new file mode 100644
index 000000000000..81f04d536785
--- /dev/null
+++ b/app-text/ghostscript-afpl/files/gdevcups.patch
@@ -0,0 +1,432 @@
+--- aaa/ghostscript-8.53/pstoraster/gdevcups.c  2005-01-24 14:17:24.016026784 +0100
++++ bbb/ghostscript-8.53/pstoraster/gdevcups.c  2005-01-24 14:16:53.037736200 +0100
+408c408
+<   fprintf(stderr, "DEBUG2: cups_close(%p)\n", pdev);
+---
+>   dpf("DEBUG2: cups_close(%p)\n", pdev);
+561c561
+<   fprintf(stderr, "DEBUG2: cups_get_matrix(%p, %p)\n", pdev, pmat);
+---
+>   dpf("DEBUG2: cups_get_matrix(%p, %p)\n", pdev, pmat);
+575,576c575,576
+<   fprintf(stderr, "DEBUG: cups->header.Duplex = %d\n", cups->header.Duplex);
+<   fprintf(stderr, "DEBUG: cups->page = %d\n", cups->page);
+---
+>   dpf("DEBUG: cups->header.Duplex = %d\n", cups->header.Duplex);
+>   dpf("DEBUG: cups->page = %d\n", cups->page);
+580,581c580,581
+<     fprintf(stderr, "DEBUG: cupsPPD = %p\n", cupsPPD);
+<     fprintf(stderr, "DEBUG: cupsPPD->flip_duplex = %d\n", cupsPPD->flip_duplex);
+---
+>     dpf("DEBUG: cupsPPD = %p\n", cupsPPD);
+>     dpf("DEBUG: cupsPPD->flip_duplex = %d\n", cupsPPD->flip_duplex);
+632c632
+<   fprintf(stderr, "DEBUG: width = %d, height = %d\n", cups->width,
+---
+>   dpf("DEBUG: width = %d, height = %d\n", cups->width,
+634c634
+<   fprintf(stderr, "DEBUG: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n",
+---
+>   dpf("DEBUG: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n",
+637c637
+<   fprintf(stderr, "DEBUG: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
+---
+>   dpf("DEBUG: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
+640c640
+<   fprintf(stderr, "DEBUG: matrix = [ %.3f %.3f %.3f %.3f %.3f %.3f ]\n",
+---
+>   dpf("DEBUG: matrix = [ %.3f %.3f %.3f %.3f %.3f %.3f ]\n",
+663c663
+<   fprintf(stderr, "DEBUG2: cups_get_params(%p, %p)\n", pdev, plist);
+---
+>   dpf("DEBUG2: cups_get_params(%p, %p)\n", pdev, plist);
+671c671
+<   fputs("DEBUG2: before gdev_prn_get_params()\n", stderr);
+---
+>   dputs("DEBUG2: before gdev_prn_get_params()\n");
+678c678
+<   fputs("DEBUG2: after gdev_prn_get_params()\n", stderr);
+---
+>   dputs("DEBUG2: after gdev_prn_get_params()\n");
+686c686
+<   fputs("DEBUG2: Adding MediaClass\n", stderr);
+---
+>   dputs("DEBUG2: Adding MediaClass\n");
+694c694
+<   fputs("DEBUG2: Adding AdvanceDistance\n", stderr);
+---
+>   dputs("DEBUG2: Adding AdvanceDistance\n");
+702c702
+<   fputs("DEBUG2: Adding AdvanceDistance\n", stderr);
+---
+>   dputs("DEBUG2: Adding AdvanceDistance\n");
+710c710
+<   fputs("DEBUG2: Adding Collate\n", stderr);
+---
+>   dputs("DEBUG2: Adding Collate\n");
+718c718
+<   fputs("DEBUG2: Adding CutMedia\n", stderr);
+---
+>   dputs("DEBUG2: Adding CutMedia\n");
+726c726
+<   fputs("DEBUG2: Adding InsertSheet\n", stderr);
+---
+>   dputs("DEBUG2: Adding InsertSheet\n");
+734c734
+<   fputs("DEBUG2: Adding Jog\n", stderr);
+---
+>   dputs("DEBUG2: Adding Jog\n");
+742c742
+<   fputs("DEBUG2: Adding LeadingEdge\n", stderr);
+---
+>   dputs("DEBUG2: Adding LeadingEdge\n");
+750c750
+<   fputs("DEBUG2: Adding ManualFeed\n", stderr);
+---
+>   dputs("DEBUG2: Adding ManualFeed\n");
+758c758
+<   fputs("DEBUG2: Adding MediaPosition\n", stderr);
+---
+>   dputs("DEBUG2: Adding MediaPosition\n");
+766c766
+<   fputs("DEBUG2: Adding MirrorPrint\n", stderr);
+---
+>   dputs("DEBUG2: Adding MirrorPrint\n");
+774c774
+<   fputs("DEBUG2: Adding NegativePrint\n", stderr);
+---
+>   dputs("DEBUG2: Adding NegativePrint\n");
+782c782
+<   fputs("DEBUG2: Adding OutputFaceUp\n", stderr);
+---
+>   dputs("DEBUG2: Adding OutputFaceUp\n");
+790c790
+<   fputs("DEBUG2: Adding Separations\n", stderr);
+---
+>   dputs("DEBUG2: Adding Separations\n");
+798c798
+<   fputs("DEBUG2: Adding TraySwitch\n", stderr);
+---
+>   dputs("DEBUG2: Adding TraySwitch\n");
+806c806
+<   fputs("DEBUG2: Adding Tumble\n", stderr);
+---
+>   dputs("DEBUG2: Adding Tumble\n");
+814c814
+<   fputs("DEBUG2: Adding cupsWidth\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsWidth\n");
+822c822
+<   fputs("DEBUG2: Adding cupsHeight\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsHeight\n");
+830c830
+<   fputs("DEBUG2: Adding cupsMediaType\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsMediaType\n");
+838c838
+<   fputs("DEBUG2: Adding cupsBitsPerColor\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsBitsPerColor\n");
+846c846
+<   fputs("DEBUG2: Adding cupsBitsPerPixel\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsBitsPerPixel\n");
+854c854
+<   fputs("DEBUG2: Adding cupsBytesPerLine\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsBytesPerLine\n");
+862c862
+<   fputs("DEBUG2: Adding cupsColorOrder\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsColorOrder\n");
+870c870
+<   fputs("DEBUG2: Adding cupsColorSpace\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsColorSpace\n");
+878c878
+<   fputs("DEBUG2: Adding cupsCompression\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsCompression\n");
+886c886
+<   fputs("DEBUG2: Adding cupsRowCount\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsRowCount\n");
+894c894
+<   fputs("DEBUG2: Adding cupsRowFeed\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsRowFeed\n");
+902c902
+<   fputs("DEBUG2: Adding cupsRowStep\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsRowStep\n");
+911c911
+<   fputs("DEBUG2: Adding cupsNumColors\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsNumColors\n");
+919c919
+<   fputs("DEBUG2: Adding cupsInteger\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsInteger\n");
+931c931
+<   fputs("DEBUG2: Adding cupsReal\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsReal\n");
+943c943
+<   fputs("DEBUG2: Adding cupsString\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsString\n");
+955c955
+<   fputs("DEBUG2: Adding cupsMarkerType\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsMarkerType\n");
+963c963
+<   fputs("DEBUG2: Adding cupsRenderingIntent\n", stderr);
+---
+>   dputs("DEBUG2: Adding cupsRenderingIntent\n");
+972c972
+<   fputs("DEBUG2: Leaving cups_get_params()\n", stderr);
+---
+>   dputs("DEBUG2: Leaving cups_get_params()\n");
+995c995
+<   fprintf(stderr, "DEBUG2: cups_get_space_params(%p, %p)\n", pdev, space_params);
+---
+>   dpf("DEBUG2: cups_get_space_params(%p, %p)\n", pdev, space_params);
+1023c1023
+<   fprintf(stderr, "DEBUG: cache_size = %.0f\n", cache_size);
+---
+>   dpf("DEBUG: cache_size = %.0f\n", cache_size);
+1071c1071
+<   fprintf(stderr, "DEBUG2: cups_map_cmyk(%p, %d, %d, %d, %d, %p)\n",
+---
+>   dpf("DEBUG2: cups_map_cmyk(%p, %d, %d, %d, %d, %p)\n",
+1434c1434
+<         fprintf(stderr, "DEBUG2:   \\=== COLOR %d\n", out[0]);
+---
+>         dpf("DEBUG2:   \\=== COLOR %d\n", out[0]);
+1440c1440
+<         fprintf(stderr, "DEBUG2:   \\=== COLOR %d, %d, %d\n",
+---
+>         dpf("DEBUG2:   \\=== COLOR %d, %d, %d\n",
+1447c1447
+<         fprintf(stderr, "DEBUG2:   \\=== COLOR %d, %d, %d, %d\n",
+---
+>         dpf("DEBUG2:   \\=== COLOR %d, %d, %d, %d\n",
+1465c1465
+<   fprintf(stderr, "DEBUG2: cups_map_gray(%p, %d, %p)\n",
+---
+>   dpf("DEBUG2: cups_map_gray(%p, %d, %p)\n",
+1496c1496
+<   fprintf(stderr, "DEBUG2: cups_map_rgb(%p, %p, %d, %d, %d, %p)\n",
+---
+>   dpf("DEBUG2: cups_map_rgb(%p, %p, %d, %d, %d, %p)\n",
+1586c1586
+<   fprintf(stderr, "DEBUG2: cups_map_cmyk_color(%p, %d, %d, %d, %d)\n", pdev,
+---
+>   dpf("DEBUG2: cups_map_cmyk_color(%p, %d, %d, %d, %d)\n", pdev,
+1701c1701
+<   fprintf(stderr, "DEBUG2: CMYK (%d,%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n",
+---
+>   dpf("DEBUG2: CMYK (%d,%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n",
+1731c1731
+<   fprintf(stderr, "DEBUG2: cups_map_color_rgb(%p, %d, %p)\n", pdev,
+---
+>   dpf("DEBUG2: cups_map_color_rgb(%p, %d, %p)\n", pdev,
+1743c1743
+<   fprintf(stderr, "DEBUG2: COLOR %08x = ", (unsigned)color);
+---
+>   dpf("DEBUG2: COLOR %08x = ", (unsigned)color);
+1921c1921
+<   fprintf(stderr, "%d,%d,%d\n", prgb[0], prgb[1], prgb[2]);
+---
+>   dpf("%d,%d,%d\n", prgb[0], prgb[1], prgb[2]);
+1953c1953
+<   fprintf(stderr, "DEBUG2: cups_map_rgb_color(%p, %d, %d, %d)\n", pdev, r, g, b);
+---
+>   dpf("DEBUG2: cups_map_rgb_color(%p, %d, %d, %d)\n", pdev, r, g, b);
+2162c2162
+< 	fprintf(stderr, "DEBUG2: CMY (%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n",
+---
+> 	dpf("DEBUG2: CMY (%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n",
+2406c2406
+<   fprintf(stderr, "DEBUG2: RGB %d,%d,%d = %08x\n", r, g, b, (unsigned)i);
+---
+>   dpf("DEBUG2: RGB %d,%d,%d = %08x\n", r, g, b, (unsigned)i);
+2425c2425
+<   fprintf(stderr, "DEBUG2: cups_open(%p)\n", pdev);
+---
+>   dpf("DEBUG2: cups_open(%p)\n", pdev);
+2432c2432
+<     fputs("INFO: Processing page 1...\n", stderr);
+---
+>     dpf("INFO: Processing page 1...\n");
+2468c2468
+<   fprintf(stderr, "DEBUG2: cups_print_pages(%p, %p, %d)\n", pdev, fp,
+---
+>   dpf("DEBUG2: cups_print_pages(%p, %p, %d)\n", pdev, fp,
+2507c2507
+<   fprintf(stderr, "DEBUG2: cupsBitsPerPixel = %d, cupsWidth = %d, cupsBytesPerLine = %d, srcbytes = %d\n",
+---
+>   dpf("DEBUG2: cupsBitsPerPixel = %d, cupsWidth = %d, cupsBytesPerLine = %d, srcbytes = %d\n",
+2512c2512
+<   src = (unsigned char *)gs_malloc(srcbytes, 1, "cups_print_pages");
+---
+>   src = (unsigned char *)gs_malloc(pdev->memory, srcbytes, 1, "cups_print_pages");
+2521c2521
+<   dst = (unsigned char *)gs_malloc(cups->header.cupsBytesPerLine, 2,
+---
+>   dst = (unsigned char *)gs_malloc(pdev->memory, cups->header.cupsBytesPerLine, 2,
+2537c2537
+<       gs_exit(0);
+---
+>       gs_exit(pdev->memory, 0);
+2555c2555
+<   fprintf(stderr, "DEBUG2: cupsWidth = %d, cupsHeight = %d, cupsBytesPerLine = %d\n",
+---
+>   dpf("DEBUG2: cupsWidth = %d, cupsHeight = %d, cupsBytesPerLine = %d\n",
+2585,2586c2585,2586
+<   gs_free((char *)src, srcbytes, 1, "cups_print_pages");
+<   gs_free((char *)dst, cups->header.cupsBytesPerLine, 1, "cups_print_pages");
+---
+>   gs_free(pdev->memory, (char *)src, srcbytes, 1, "cups_print_pages");
+>   gs_free(pdev->memory, (char *)dst, cups->header.cupsBytesPerLine, 1, "cups_print_pages");
+2589c2589
+<   fprintf(stderr, "INFO: Processing page %d...\n", cups->page);
+---
+>   dpf("INFO: Processing page %d...\n", cups->page);
+2623c2623
+<   fprintf(stderr, "DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
+---
+>   dpf("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
+2651c2651
+<     fprintf(stderr, "DEBUG: Setting %s to %d...\n", sname, intval); \
+---
+>     dpf("DEBUG: Setting %s to %d...\n", sname, intval); \
+2790c2790
+<     fprintf(stderr, "DEBUG: Updating PageSize to [%.0f %.0f]...\n",
+---
+>     dpf("DEBUG: Updating PageSize to [%.0f %.0f]...\n",
+2816c2816
+< 	fprintf(stderr, "DEBUG: size = %s\n", size->name);
+---
+> 	dpf("DEBUG: size = %s\n", size->name);
+2845c2845
+< 	  fprintf(stderr, "DEBUG: landscape size = %s\n", size->name);
+---
+> 	  dpf("DEBUG: landscape size = %s\n", size->name);
+2862c2862
+< 	  fputs("DEBUG: size = Custom\n", stderr);
+---
+> 	  dputs("DEBUG: size = Custom\n");
+2869c2869
+<       fprintf(stderr, "DEBUG: margins[] = [ %f %f %f %f ]\n",
+---
+>       dpf("DEBUG: margins[] = [ %f %f %f %f ]\n",
+2934c2934
+<       fprintf(stderr, "DEBUG: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n",
+---
+>       dpf("DEBUG: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n",
+2948c2948
+<       fprintf(stderr, "DEBUG: Setting initial media size, [%.0f %.0f] = %dx%d pixels...\n",
+---
+>       dpf("DEBUG: Setting initial media size, [%.0f %.0f] = %dx%d pixels...\n",
+2957,2958c2957,2958
+<   fprintf(stderr, "DEBUG2: ppd = %p\n", cupsPPD);
+<   fprintf(stderr, "DEBUG2: PageSize = [ %.3f %.3f ]\n",
+---
+>   dpf("DEBUG2: ppd = %p\n", cupsPPD);
+>   dpf("DEBUG2: PageSize = [ %.3f %.3f ]\n",
+2960c2960
+<   fprintf(stderr, "DEBUG2: margins = [ %.3f %.3f %.3f %.3f ]\n",
+---
+>   dpf("DEBUG2: margins = [ %.3f %.3f %.3f %.3f ]\n",
+2962c2962
+<   fprintf(stderr, "DEBUG2: HWResolution = [ %.3f %.3f ]\n",
+---
+>   dpf("DEBUG2: HWResolution = [ %.3f %.3f ]\n",
+2964c2964
+<   fprintf(stderr, "DEBUG2: width = %d, height = %d\n",
+---
+>   dpf("DEBUG2: width = %d, height = %d\n",
+2966c2966
+<   fprintf(stderr, "DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
+---
+>   dpf("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
+2992c2992
+<   fprintf(stderr, "DEBUG2: cups_set_color_info(%p)\n", pdev);
+---
+>   dpf("DEBUG2: cups_set_color_info(%p)\n", pdev);
+3216c3216
+<       fprintf(stderr, "DEBUG2: cupsEncodeLUT[%d] = %d\n", i, cupsEncodeLUT[i]);
+---
+>       dpf("DEBUG2: cupsEncodeLUT[%d] = %d\n", i, cupsEncodeLUT[i]);
+3223c3223
+<   fprintf(stderr, "DEBUG: num_components = %d, depth = %d\n",
+---
+>   dpf("DEBUG: num_components = %d, depth = %d\n",
+3225c3225
+<   fprintf(stderr, "DEBUG: cupsColorSpace = %d, cupsColorOrder = %d\n",
+---
+>   dpf("DEBUG: cupsColorSpace = %d, cupsColorOrder = %d\n",
+3227c3227
+<   fprintf(stderr, "DEBUG: cupsBitsPerPixel = %d, cupsBitsPerColor = %d\n",
+---
+>   dpf("DEBUG: cupsBitsPerPixel = %d, cupsBitsPerColor = %d\n",
+3229c3229
+<   fprintf(stderr, "DEBUG: max_gray = %d, dither_grays = %d\n",
+---
+>   dpf("DEBUG: max_gray = %d, dither_grays = %d\n",
+3231c3231
+<   fprintf(stderr, "DEBUG: max_color = %d, dither_colors = %d\n",
+---
+>   dpf("DEBUG: max_color = %d, dither_colors = %d\n",
+3246c3246
+<     fprintf(stderr, "DEBUG: Using user-defined profile \"%s\"...\n", cupsProfile);
+---
+>     dpf("DEBUG: Using user-defined profile \"%s\"...\n", cupsProfile);
+3252c3252
+<       fputs("DEBUG: User-defined profile does not contain 11 integers!\n", stderr);
+---
+>       dputs("DEBUG: User-defined profile does not contain 11 integers!\n");
+3301c3301
+<       fputs("DEBUG: Using color profile in PPD file!\n", stderr);
+---
+>       dputs("DEBUG: Using color profile in PPD file!\n");
+3322c3322
+<             fprintf(stderr, "DEBUG2: cupsMatrix[%d][%d][%d] = %d\n",
+---
+>             dpf("DEBUG2: cupsMatrix[%d][%d][%d] = %d\n",
+3336c3336
+<         fprintf(stderr, "DEBUG2: cupsDensity[%d] = %d\n", k, cupsDensity[k]);
+---
+>         dpf("DEBUG2: cupsDensity[%d] = %d\n", k, cupsDensity[k]);
+3355c3355
+<   fprintf(stderr, "INFO: Processing page %d...\n", cups->page);
+---
+>   dpf("INFO: Processing page %d...\n", cups->page);
+3388c3388
+<   fprintf(stderr, "DEBUG: cups_print_chunked - flip = %d, height = %d\n",
+---
+>   dpf("DEBUG: cups_print_chunked - flip = %d, height = %d\n",
+3404,3405c3404,3405
+<       fprintf(stderr, "ERROR: Unable to get scanline %d!\n", y);
+<       gs_exit(1);
+---
+>       dpf("ERROR: Unable to get scanline %d!\n", y);
+>       gs_exit(pdev->memory, 1);
+3541c3541
+<   fprintf(stderr, "DEBUG: cups_print_banded - flip = %d, height = %d\n",
+---
+>   dpf("DEBUG: cups_print_banded - flip = %d, height = %d\n",
+3559,3560c3559,3560
+<       fprintf(stderr, "ERROR: Unable to get scanline %d!\n", y);
+<       gs_exit(1);
+---
+>       dpf("ERROR: Unable to get scanline %d!\n", y);
+>       gs_exit(pdev->memory, 1);
+4144,4145c4144,4145
+< 	fprintf(stderr, "ERROR: Unable to get scanline %d!\n", y);
+< 	gs_exit(1);
+---
+> 	dpf("ERROR: Unable to get scanline %d!\n", y);
+> 	gs_exit(pdev->memory, 1);
diff --git a/app-text/ghostscript-afpl/files/gs852-lib.patch b/app-text/ghostscript-afpl/files/gs852-lib.patch
new file mode 100644
index 000000000000..568fd14cdb60
--- /dev/null
+++ b/app-text/ghostscript-afpl/files/gs852-lib.patch
@@ -0,0 +1,110 @@
+diff -Naur ghostscript-8.52.orig/lib/gs_init.ps ghostscript-8.52.lib/lib/gs_init.ps
+--- ghostscript-8.52.orig/lib/gs_init.ps	2005-04-19 05:28:33.000000000 +0100
++++ ghostscript-8.52.lib/lib/gs_init.ps	2005-10-14 18:10:55.000000000 +0100
+@@ -153,6 +153,7 @@
+ currentdict /NOFONTPATH known   /NOFONTPATH exch def
+ currentdict /NOGC known   /NOGC exch def
+ currentdict /NOINTERPOLATE .knownget { /INTERPOLATE exch not def } if
++currentdict /NOMEDIAATTRS known /NOMEDIAATTRS exch def
+ currentdict /NOOUTERSAVE known   /NOOUTERSAVE exch def
+ currentdict /NOPAGEPROMPT known   /NOPAGEPROMPT exch def
+ currentdict /NOPAUSE known   /NOPAUSE exch def
+diff -Naur ghostscript-8.52.orig/lib/gs_setpd.ps ghostscript-8.52.lib/lib/gs_setpd.ps
+--- ghostscript-8.52.orig/lib/gs_setpd.ps	2005-06-09 20:47:18.000000000 +0100
++++ ghostscript-8.52.lib/lib/gs_setpd.ps	2005-10-14 18:13:31.000000000 +0100
+@@ -375,21 +375,42 @@
+     } bind
+ .dicttomark readonly def
+ 
+-% Define the keys used in input attribute matching.
+-/.inputattrkeys [
+-  /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet /ManualFeed
+-	% The following are documented in Adobe's supplement for v2017.
+-  /LeadingEdge /MediaClass
+-] readonly def
+-% Define other keys used in media selection.
+-/.inputselectionkeys [
+-  /MediaPosition /Orientation
+-] readonly def
+-
+-% Define the keys used in output attribute matching.
+-/.outputattrkeys [
+-  /OutputType
+-] readonly def
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to support
++% the standard Adobe media attributes.
++NOMEDIAATTRS {
++  % Define only PageSize for input attribute matching.
++  /.inputattrkeys [
++    /PageSize
++  ] readonly def
++  % Define no other keys used in media selection.
++  /.inputselectionkeys [
++    /noInputSelectionsKeys
++  ] readonly def
++
++  % Define no keys used in output attribute matching.
++  /.outputattrkeys [
++    /noOutputAttrKeys
++  ] readonly def
++} {
++  % Define the keys used in input attribute matching.
++  /.inputattrkeys [
++    /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet /ManualFeed
++     % The following are documented in Adobe's supplement for v2017.
++    /LeadingEdge /MediaClass
++  ] readonly def
++  % Define other keys used in media selection.
++  /.inputselectionkeys [
++    /MediaPosition /Orientation
++  ] readonly def
++
++  % Define the keys used in output attribute matching.
++  /.outputattrkeys [
++    /OutputType
++  ] readonly def
++} ifelse
+ 
+ % Define all the parameters that should always be copied to the merged
+ % dictionary.
+@@ -418,7 +439,13 @@
+   /PageSize //false		% obsolete alias for .MediaSize
+   /InputAttributes //false
+   .inputattrkeys
+-    { dup /PageSize eq
++    % M. Sweet, Easy Software Products:
++    %
++    % Treat LeadingEdge like PageSize so that a common Ghostscript driver
++    % doesn't need the NOMEDIAATTRS definition.
++    %
++    % { dup /PageSize eq
++    { dup dup /PageSize eq exch /LeadingEdge eq or
+        { pop }
+        { { 2 index /InputAttributes .knownget { //null eq } { //true } ifelse } }
+       ifelse
+@@ -499,11 +526,22 @@
+ % They are expected to consume the top 2 operands.
+ % NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize)
+ % the same as 0, i.e., we signal an error.
++%
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to support
++% the standard Adobe media attributes.
+   0 {		% Set errorinfo and signal a configurationerror.
++      NOMEDIAATTRS {
++        % NOMEDIAATTRS means that the default policy is 7...
++        pop 2 index exch 7 put
++      } {
+ 	pop dup 4 index exch get 2 array astore
+ 	$error /errorinfo 3 -1 roll put
+ 	cleartomark
+ 	/setpagedevice load /configurationerror signalerror
++      } ifelse
+   } bind
+   1 {		% Roll back the failed request to its previous status.
+ SETPDDEBUG { (Rolling back.) = pstack flush } if
diff --git a/app-text/ghostscript-afpl/files/rinkj.patch b/app-text/ghostscript-afpl/files/rinkj.patch
new file mode 100644
index 000000000000..c8dd6cfe592f
--- /dev/null
+++ b/app-text/ghostscript-afpl/files/rinkj.patch
@@ -0,0 +1,22 @@
+--- Makefile.in	2005-01-18 16:24:54.057142264 -0500
++++ Makefile.in.new	2005-01-18 17:13:27.153175432 -0500
+@@ -365,7 +365,7 @@
+ DEVICE_DEVS=$(DISPLAY_DEV) @X11DEVS@
+ 
+ DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
+-DEVICE_DEVS2=#$(DD)rinkj.dev
++DEVICE_DEVS2=$(DD)rinkj.dev
+ DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
+ DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
+ DEVICE_DEVS5=$(DD)uniprint.dev @IJSDEVS@
+--- src/gdevrinkj.c	2004-05-29 01:02:59.000000000 +0200
++++ src/gdevrinkj.c.new	2005-10-08 13:36:42.000000000 +0200
+@@ -760,7 +760,7 @@
+  * number if the name is found.  It returns a negative value if not found.
+  */
+ private int
+-rinkj_get_color_comp_index(const gx_device * dev, const char * pname, int name_size, int src_index)
++rinkj_get_color_comp_index(gx_device * dev, const char * pname, int name_size, int src_index)
+ {
+ /* TO_DO_DEVICEN  This routine needs to include the effects of the SeparationOrder array */
+     const fixed_colorant_names_list * list = ((const rinkj_device *)dev)->std_colorant_names;
diff --git a/app-text/ghostscript-afpl/ghostscript-afpl-8.53.ebuild b/app-text/ghostscript-afpl/ghostscript-afpl-8.53.ebuild
new file mode 100644
index 000000000000..1f0e003f4029
--- /dev/null
+++ b/app-text/ghostscript-afpl/ghostscript-afpl-8.53.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ghostscript-afpl-8.53.ebuild,v 1.1 2005/11/02 00:29:49 genstef Exp $
+
+inherit eutils
+
+DESCRIPTION="AFPL Ghostscript"
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/"
+
+MY_PN="ghostscript"
+MY_P=${MY_PN}-${PV}
+CUPS_PV=1.1.23
+
+SRC_URI="mirror://sourceforge/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="Aladdin"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="X cups cjk gtk jasper"
+
+PROVIDE="virtual/ghostscript"
+
+DEPEND="virtual/libc
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.2.1
+	>=media-fonts/gnu-gs-fonts-std-8.11
+	X? ( virtual/x11 )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
+	cups? ( net-print/cups )
+	jasper? ( media-libs/jasper )
+	!virtual/ghostscript"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ghostscript-${PV}.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
+		#81418
+		sed -i 's:OUTPUTFILE="%stdout" $profile $6$:OUTPUTFILE="%stdout" $profile $6 -:' pstoraster
+		sed -i -e "s:pstopcl6:pstopxl:" cups.mak
+		cd ..
+		epatch ${FILESDIR}/gs852-lib.patch
+		epatch ${FILESDIR}/gdevcups.patch
+	fi
+
+	epatch ${FILESDIR}/rinkj.patch
+
+	# 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}/Makefile.in
+}
+
+src_compile() {
+	# 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 \
+		$(use_with X x) \
+		$(use_with jasper) \
+		|| die "econf failed"
+#		$(use_with ijs) \
+#		$(use_with jbig2dec) \
+
+	# 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:LDFLAGS=\(.*\)$(XLDFLAGS):LDFLAGS=\1-L/usr/include -lcups -lcupsimage $(XLDFLAGS):' Makefile
+	fi
+
+	# search path fix
+	sed -i -e "s:\$(gsdatadir)/lib:/usr/share/ghostscript/${PV}/lib:" Makefile
+	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' Makefile
+	sed -i -e "s:\$(gsdatadir)/Resource:/usr/share/ghostscript/${PV}/Resource:" Makefile
+
+	emake || die "emake failed"
+	emake so || die "emake so failed"
+
+	# build ijs
+	cd ijs
+	./autogen.sh
+	econf --prefix=${D}/usr || die "econf failed"
+	emake || die "emake failed"
+	cd ..
+}
+
+src_install() {
+	einstall 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/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
+	einstall install_prefix=${D}
+}