Fixed security issue: integer overflows in ICC library, bug #261087, thank Robert Buchholz for report. Respect LDFLAGS. Remove old.

(Portage version: 2.2_rc25/cvs/Linux i686)

7 files changed, 69 insertions, 673 deletions

diff --git a/app-text/ghostscript-gnu/ChangeLog b/app-text/ghostscript-gnu/ChangeLog
index 81edfcc43891..9934b816496b 100644
--- a/app-text/ghostscript-gnu/ChangeLog
+++ b/app-text/ghostscript-gnu/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-text/ghostscript-gnu
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ChangeLog,v 1.38 2008/11/17 20:27:41 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ChangeLog,v 1.39 2009/03/19 20:40:22 pva Exp $
+
+*ghostscript-gnu-8.62.0 (19 Mar 2009)
+
+  19 Mar 2009; Peter Volkov <pva@gentoo.org>
+  -files/ghostscript-afpl-8.54-cups-destdir.diff,
+  +files/ghostscript-gnu-8.62.0-CVE-2009-0583.patch,
+  +files/ghostscript-gnu-8.62.0-LDFLAGS-strip.patch, -files/gdevcups.patch,
+  -ghostscript-gnu-8.55.ebuild, -ghostscript-gnu-8.60.0.ebuild,
+  -ghostscript-gnu-8.60.0-r1.ebuild, +ghostscript-gnu-8.62.0.ebuild:
+  Fixed security issue: integer overflows in ICC library, bug #261087, thank
+  Robert Buchholz for report. Respect LDFLAGS. Remove old.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/ghostscript-CVE-2007-2721.patch:
diff --git a/app-text/ghostscript-gnu/files/gdevcups.patch b/app-text/ghostscript-gnu/files/gdevcups.patch
deleted file mode 100644
index 81f04d536785..000000000000
--- a/app-text/ghostscript-gnu/files/gdevcups.patch
+++ /dev/null
@@ -1,432 +0,0 @@
---- 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-gnu/files/ghostscript-afpl-8.54-cups-destdir.diff b/app-text/ghostscript-gnu/files/ghostscript-afpl-8.54-cups-destdir.diff
deleted file mode 100644
index 8f9e67c53da2..000000000000
--- a/app-text/ghostscript-gnu/files/ghostscript-afpl-8.54-cups-destdir.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur ghostscript-8.54.orig/pstoraster/cups.mak ghostscript-8.54/pstoraster/cups.mak
---- ghostscript-8.54.orig/pstoraster/cups.mak	2006-05-23 19:59:45.000000000 +0200
-+++ ghostscript-8.54/pstoraster/cups.mak	2006-05-23 20:32:44.000000000 +0200
-@@ -24,9 +24,9 @@
- 
- cups_=	$(GLOBJ)gdevcups.$(OBJ)
- 
--CUPSSERVER= $(install_prefix)`cups-config --serverbin`
--CUPSCONFIG= $(install_prefix)`cups-config --serverroot`
--CUPSDATA= $(install_prefix)`cups-config --datadir`
-+CUPSSERVER= $(DESTDIR)`cups-config --serverbin`
-+CUPSCONFIG= $(DESTDIR)`cups-config --serverroot`
-+CUPSDATA= $(DESTDIR)`cups-config --datadir`
- 
- $(DD)cups.dev:	$(cups_) $(GLD)page.dev
- 	$(ADDMOD) $(DD)cups -lib cupsimage -lib cups
diff --git a/app-text/ghostscript-gnu/files/ghostscript-gnu-8.62.0-LDFLAGS-strip.patch b/app-text/ghostscript-gnu/files/ghostscript-gnu-8.62.0-LDFLAGS-strip.patch
new file mode 100644
index 000000000000..e63720bcbb3f
--- /dev/null
+++ b/app-text/ghostscript-gnu/files/ghostscript-gnu-8.62.0-LDFLAGS-strip.patch
@@ -0,0 +1,44 @@
+=== modified file 'src/devs.mak'
+--- src/devs.mak	2009-03-07 19:29:39 +0000
++++ src/devs.mak	2009-03-07 20:29:59 +0000
+@@ -425,11 +425,11 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)lvga256.so: $(lvga256_)
+-	$(CCLD) -shared -Wl,'-solvga256.so' $(lvga256_) -lvga -lvgagl
++	$(CCLD) $(LDFLAGS) -shared -Wl,'-solvga256.so' $(lvga256_) -lvga -lvgagl
+ 	mv lvga256.so $(GLOBJ)lvga256.so
+ 
+ $(GLOBJ)vgalib.so: $(vgalib_)
+-	$(CCLD) -shared -Wl,'-sovgalib.so' $(vgalib_) -lvga -lvgagl
++	$(CCLD) $(LDFLAGS) -shared -Wl,'-sovgalib.so' $(vgalib_) -lvga -lvgagl
+ 	mv vgalib.so $(GLOBJ)vgalib.so
+ 
+ ### -------------------------- The X11 device -------------------------- ###
+@@ -533,7 +533,7 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)X11.so: $(x11alt_) $(x11_)
+-	$(CCLD) -shared -Wl,'-soX11.so' $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
++	$(CCLD) $(LDFLAGS) -shared -Wl,'-oX11.so' $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ 	mv X11.so $(GLOBJ)X11.so
+ 
+ ###### --------------- Memory-buffered printer devices --------------- ######
+
+=== modified file 'src/unix-dll.mak'
+--- src/unix-dll.mak	2009-03-07 19:29:39 +0000
++++ src/unix-dll.mak	2009-03-07 19:51:51 +0000
+@@ -84,10 +84,10 @@
+ # Build the small Ghostscript loaders, with Gtk+ and without
+ 
+ $(GSSOC_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER)
+-	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
++	$(GLCC) -g $(LDFLAGS) -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
+ 
+ $(GSSOX_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER)
+-	$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(GLSRC)$(SOC_LOADER) \
++	$(GLCC) -g $(LDFLAGS) $(SOC_CFLAGS) -o $(GSSOX_XE) $(GLSRC)$(SOC_LOADER) \
+ 	-L$(BINDIR) -l$(GS) $(SOC_LIBS)
+ 
+ # ------------------------- Recursive make targets ------------------------- #
+
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild
deleted file mode 100644
index 7d67907f3f7d..000000000000
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2008 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.55.ebuild,v 1.7 2008/10/31 20:26:43 opfer Exp $
-
-WANT_AUTOMAKE=1.6
-inherit autotools eutils versionator flag-o-matic
-
-DESCRIPTION="GNU Ghostscript - patched GPL Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/ghostscript/"
-
-CUPS_PV=1.1.23
-MY_P=gnu-ghostscript-${PV}
-PVM=$(get_version_component_range 1-2)
-SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
-		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
-	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )
-	mirror://gnu/ghostscript/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X cups cjk gtk jpeg2k"
-
-DEP="virtual/libc
-	>=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 )
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	cups? ( >=net-print/cups-1.1.20 )
-	jpeg2k? ( media-libs/jasper )
-	!app-text/ghostscript-esp
-	!app-text/ghostscript-gpl"
-
-RDEPEND="${DEP}
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
-	media-fonts/gnu-gs-fonts-std"
-
-DEPEND="${DEP}
-	gtk? ( dev-util/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
-	ln -s ${S}/{,src}/Makefile.in
-	if use cjk; then
-		cat ${FILESDIR}/ghostscript-esp-8.15.2-cidfmap.cjk >> ${S}/lib/cidfmap
-		cat ${FILESDIR}/ghostscript-esp-8.15.2-FAPIcidfmap.cjk >> ${S}/lib/FAPIcidfmap
-		cd ${S}/Resource
-		unpack adobe-cmaps-200406.tar.gz
-		unpack acro5-cmaps-2001.tar.gz
-		cd ${WORKDIR}
-	fi
-
-	# cups support
-	if use cups; then
-		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 ${FILESDIR}/gdevcups.patch
-		epatch ${FILESDIR}/ghostscript-afpl-8.54-cups-destdir.diff
-
-		echo 'include pstoraster/cups.mak' >> src/Makefile.in
-		sed -i -e 's:DEVICE_DEVS17=:\0$(DD)cups.dev:' src/Makefile.in || die "sed failed"
-		sed -i -e 's:EXTRALIBS=.*:\0 -lcups -lcupsimage:' src/Makefile.in || die "sed failed"
-	fi
-	cd ${S}
-
-	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):" \
-		-e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
-		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
-		Makefile.in src/Makefile.in src/*.mak || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		$(use_with X x) \
-		$(use_with jpeg2k jasper) \
-		--with-ijs \
-		--with-jbig2dec \
-		|| die "econf failed"
-	emake STDDIRS || die "emake failed"
-
-	cd ijs
-	econf || die "ijs econf failed"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install soinstall || die "emake install failed"
-
-	rm -fr ${D}/usr/share/doc/${PF}/html/{README,PUBLIC}
-	dodoc doc/README
-
-	cd ${S}/ijs
-	emake DESTDIR="${D}" install || die "emake ijs install failed"
-}
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.60.0-r1.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.60.0-r1.ebuild
deleted file mode 100644
index bf5e0698038d..000000000000
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.60.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2008 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.60.0-r1.ebuild,v 1.3 2008/10/31 20:26:43 opfer Exp $
-
-WANT_AUTOMAKE=1.9
-
-inherit autotools eutils versionator flag-o-matic
-
-DESCRIPTION="GNU Ghostscript - patched GPL Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/ghostscript/"
-
-MY_P=gnu-ghostscript-${PV}
-PVM=$(get_version_component_range 1-2)
-SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
-		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
-	mirror://gnu/ghostscript/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X cups cjk gtk jpeg2k"
-
-DEP="virtual/libc
-	>=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 x11-libs/libXext )
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	cups? ( >=net-print/cups-1.1.20 )
-	!app-text/ghostscript-esp
-	!app-text/ghostscript-gpl"
-
-RDEPEND="${DEP}
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
-	media-fonts/gnu-gs-fonts-std"
-
-DEPEND="${DEP}
-	gtk? ( dev-util/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
-	if use cjk; then
-		cat "${FILESDIR}"/ghostscript-esp-8.15.2-cidfmap.cjk >> "${S}"/lib/cidfmap
-		cat "${FILESDIR}"/ghostscript-esp-8.15.2-FAPIcidfmap.cjk >> "${S}"/lib/FAPIcidfmap
-		cd "${S}"/Resource
-		unpack adobe-cmaps-200406.tar.gz
-		unpack acro5-cmaps-2001.tar.gz
-		cd "${WORKDIR}"
-	fi
-
-	cd "${S}"
-
-	epatch "${FILESDIR}"/ghostscript-CVE-2007-2721.patch
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
-		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
-		Makefile.in src/*.mak || die "sed failed"
-}
-
-src_compile() {
-	econf $(use_with X x) \
-		$(use_with jpeg2k jasper) \
-		$(use_enable cups) \
-		$(use_enable gtk) \
-		--with-ijs \
-		--with-jbig2dec \
-		--disable-compile-inits \
-		--enable-dynamic \
-		|| die "econf failed"
-
-	emake -j1 so all || die "emake failed"
-
-	cd ijs
-	econf || die "ijs econf failed"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install || die "emake install failed"
-
-	rm -fr "${D}"/usr/share/doc/${PF}/html/{README,PUBLIC}
-	dodoc doc/README
-
-	cd "${S}"/ijs
-	emake DESTDIR="${D}" install || die "emake ijs install failed"
-}
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.60.0.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.62.0.ebuild
index ce4136562c85..a3a7c6e29f43 100644
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.60.0.ebuild
+++ b/app-text/ghostscript-gnu/ghostscript-gnu-8.62.0.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.60.0.ebuild,v 1.3 2008/10/31 20:26:43 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ghostscript-gnu-8.62.0.ebuild,v 1.1 2009/03/19 20:40:22 pva Exp $
 
-WANT_AUTOMAKE=1.9
-
-inherit autotools eutils versionator flag-o-matic
+inherit eutils versionator flag-o-matic
 
 DESCRIPTION="GNU Ghostscript - patched GPL Ghostscript"
 HOMEPAGE="http://www.gnu.org/software/ghostscript/"
@@ -13,14 +11,15 @@ MY_P=gnu-ghostscript-${PV}
 PVM=$(get_version_component_range 1-2)
 SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
 		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
-	mirror://gnu/ghostscript/${MY_P}.tar.bz2"
+	mirror://gnu/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/ghostscript-gnu-8.62.0-CVE-2009-0583.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="X cups cjk gtk jpeg2k"
 
-DEP="virtual/libc
+DEP="
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.5
 	>=sys-libs/zlib-1.1.4
@@ -28,7 +27,6 @@ DEP="virtual/libc
 	X? ( x11-libs/libXt x11-libs/libXext )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( >=net-print/cups-1.1.20 )
-	jpeg2k? ( media-libs/jasper )
 	!app-text/ghostscript-esp
 	!app-text/ghostscript-gpl"
 
@@ -51,7 +49,6 @@ src_unpack() {
 		cd "${S}"/Resource
 		unpack adobe-cmaps-200406.tar.gz
 		unpack acro5-cmaps-2001.tar.gz
-		cd "${WORKDIR}"
 	fi
 
 	cd "${S}"
@@ -63,6 +60,9 @@ src_unpack() {
 		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
 		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
 		Makefile.in src/*.mak || die "sed failed"
+
+	epatch "${WORKDIR}/${P}-CVE-2009-0583.patch" #261087
+	epatch "${FILESDIR}/${P}-LDFLAGS-strip.patch"
 }
 
 src_compile() {
@@ -73,13 +73,12 @@ src_compile() {
 		--with-ijs \
 		--with-jbig2dec \
 		--disable-compile-inits \
-		--enable-dynamic \
-		|| die "econf failed"
+		--enable-dynamic
 
 	emake -j1 so all || die "emake failed"
 
-	cd ijs
-	econf || die "ijs econf failed"
+	cd ijs || die
+	econf
 	emake || die "ijs emake failed"
 }