Revbump adding the patch to fix CVE-2007-2721 in all available versions, see bug #196860. Also fix bug #197818, thanks Sven for reporting.

Package-Manager: portage-2.1.3.16

9 files changed, 455 insertions, 46 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index ca1484747659..5fd1fbfe4308 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.21 2007/11/01 13:13:58 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.22 2007/11/02 20:39:17 tgurr Exp $
+
+*ghostscript-gpl-8.60-r1 (02 Nov 2007)
+*ghostscript-gpl-8.57-r1 (02 Nov 2007)
+*ghostscript-gpl-8.54-r1 (02 Nov 2007)
+
+  02 Nov 2007; Timo Gurr <tgurr@gentoo.org>
+  +files/ghostscript-CVE-2007-2721.patch, +ghostscript-gpl-8.54-r1.ebuild,
+  -ghostscript-gpl-8.57.ebuild, +ghostscript-gpl-8.57-r1.ebuild,
+  +ghostscript-gpl-8.60-r1.ebuild:
+  Revbump adding the patch to fix CVE-2007-2721 in all available versions, see
+  bug #196860. Also fix bug #197818, thanks Sven for reporting.
 
   01 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
   ghostscript-gpl-8.60.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index e0d809572542..dbdf929cc4aa 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX djvu-gs-gpl-8.60.patch 1636 RMD160 ae4e7e848b0e44f7d58d3121c27dd4425c174844 SHA1 cb1bff94ec47ccdeb7914375d472a02f22b3f1db SHA256 8a30f9d8bc02ecd3cddb4c18d38fab125228b116e9939c8f8c23fa9642f54009
 MD5 7cabb316b2258839672fbad4e0629ad0 files/djvu-gs-gpl-8.60.patch 1636
 RMD160 ae4e7e848b0e44f7d58d3121c27dd4425c174844 files/djvu-gs-gpl-8.60.patch 1636
@@ -41,6 +38,10 @@ AUX ghostscript-8.60-scripts.patch 1192 RMD160 95bace3214b0d2b9896b281f42c25fd24
 MD5 84384d5f89ef13b51606cf6abefeeefd files/ghostscript-8.60-scripts.patch 1192
 RMD160 95bace3214b0d2b9896b281f42c25fd24f6e2797 files/ghostscript-8.60-scripts.patch 1192
 SHA256 e05700c3747a86d2984c3e174aaebc7f21a1f9d55c0f35be6ebc287675671709 files/ghostscript-8.60-scripts.patch 1192
+AUX ghostscript-CVE-2007-2721.patch 1697 RMD160 a419cc2e15a7e66d9931a795de5cbf024e9e775c SHA1 53eb5999ce28a9e3cbac50d24ac0bd1eee2380cc SHA256 86db9b8733ae21b2c764f8cb51c7aae11c0f8b496162b67e3093462fb66199a6
+MD5 7b0067973b82a40c4f06cc22b4c9f854 files/ghostscript-CVE-2007-2721.patch 1697
+RMD160 a419cc2e15a7e66d9931a795de5cbf024e9e775c files/ghostscript-CVE-2007-2721.patch 1697
+SHA256 86db9b8733ae21b2c764f8cb51c7aae11c0f8b496162b67e3093462fb66199a6 files/ghostscript-CVE-2007-2721.patch 1697
 AUX ghostscript-afpl-8.54-big-cmap-post.patch 7588 RMD160 7afa1acae19228903e94b7203515602701d45bff SHA1 4b1e94f885053c63d4f90d5289474bff15be0e2c SHA256 e207a316591ab6d827c1752efd79e7d5c0b072e93a7adca1508bf63b51cae549
 MD5 33ed647c4208f611993c427a0d5a0264 files/ghostscript-afpl-8.54-big-cmap-post.patch 7588
 RMD160 7afa1acae19228903e94b7203515602701d45bff files/ghostscript-afpl-8.54-big-cmap-post.patch 7588
@@ -94,22 +95,30 @@ DIST ghostscript-8.57.tar.bz2 11934408 RMD160 034331d9713cb551e1081c6bd53dbe4c98
 DIST ghostscript-8.60.tar.bz2 12942029 RMD160 208168fcd6bc5fd931d15b288ce9324f59ba07a3 SHA1 f0045b5055d7f83bf34b205976f73a7dafdac863 SHA256 f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a
 DIST gsdjvu-1.1.tar.gz 214364 RMD160 aa1ff4a80b02b16e43bf8e14719613f98bdf13c6 SHA1 cc33916f86a0f826159e5afed43d7fae722b3133 SHA256 39f32b9946a65cbe8d5b7c2882ef0e82d5858e78e04b568bb525d2c4e2d6ce78
 DIST gsdjvu-1.2.tar.gz 214539 RMD160 6cf27e95955b5ae0cc15dacc36ce514ff8347ab0 SHA1 e393193d8794c8a9c17e5642f90f2644c7ced155 SHA256 ab4a81eddb44241bb71b5ec813242036312effc9eb1b343b3c257fb563fa8a49
+EBUILD ghostscript-gpl-8.54-r1.ebuild 5677 RMD160 a488cfd9f2def244d53331bd60c09a21540dce7b SHA1 7a35c9dbc632aea804a48ed5f6badb49dd4270d0 SHA256 9a2cd1d7ad1686fad148480d43ed69cf198b52c51fe4ee0a16c5c73f26fb8cf2
+MD5 26f578309fd1bf98c03e5535a2fd9b02 ghostscript-gpl-8.54-r1.ebuild 5677
+RMD160 a488cfd9f2def244d53331bd60c09a21540dce7b ghostscript-gpl-8.54-r1.ebuild 5677
+SHA256 9a2cd1d7ad1686fad148480d43ed69cf198b52c51fe4ee0a16c5c73f26fb8cf2 ghostscript-gpl-8.54-r1.ebuild 5677
 EBUILD ghostscript-gpl-8.54.ebuild 5551 RMD160 9ce56d8df42553a6cdf4bda95ec9010605b5c609 SHA1 5ab09c1efdf4cdb67ccadce590c62f025cdd955b SHA256 87fbc9296139d93d29a2be534d588d907dfdae6a599487c0ceb960c3c44f4970
 MD5 203240523659481e554b331a2e435bb0 ghostscript-gpl-8.54.ebuild 5551
 RMD160 9ce56d8df42553a6cdf4bda95ec9010605b5c609 ghostscript-gpl-8.54.ebuild 5551
 SHA256 87fbc9296139d93d29a2be534d588d907dfdae6a599487c0ceb960c3c44f4970 ghostscript-gpl-8.54.ebuild 5551
-EBUILD ghostscript-gpl-8.57.ebuild 5523 RMD160 e0ef9cf7285ea9b7a61b248fbb904e168ecf6875 SHA1 ff2d2de24049468ac5f4737156ece9487a2d683c SHA256 f88cb9dabd61e46c991ffc815e07ea1fad25e2b5685796b70af33b499bc4e510
-MD5 f05120c3fe1e7a236870201970a362b7 ghostscript-gpl-8.57.ebuild 5523
-RMD160 e0ef9cf7285ea9b7a61b248fbb904e168ecf6875 ghostscript-gpl-8.57.ebuild 5523
-SHA256 f88cb9dabd61e46c991ffc815e07ea1fad25e2b5685796b70af33b499bc4e510 ghostscript-gpl-8.57.ebuild 5523
+EBUILD ghostscript-gpl-8.57-r1.ebuild 5524 RMD160 ac13fbd7a6fe93551040fa5b1aa4a5b77e15270f SHA1 03ee0da3f50740f931c4a214ef3720173529c638 SHA256 a12610498753f15837e82ac6cf6e01143f64b70601c710b2b532eb730224af3d
+MD5 58d4671398ba0443fe4c627b15d6c4e5 ghostscript-gpl-8.57-r1.ebuild 5524
+RMD160 ac13fbd7a6fe93551040fa5b1aa4a5b77e15270f ghostscript-gpl-8.57-r1.ebuild 5524
+SHA256 a12610498753f15837e82ac6cf6e01143f64b70601c710b2b532eb730224af3d ghostscript-gpl-8.57-r1.ebuild 5524
+EBUILD ghostscript-gpl-8.60-r1.ebuild 4737 RMD160 5bfc7405f41f228a8d773ad840f662eeced72dbf SHA1 ded32f5b1c3e2b163ee0a644658e4010d1057e89 SHA256 fac703c5ca84b83358010cf4b9cd541f46c62302388affbcfd70896b6e0be459
+MD5 6ff897cb73141e65c6e391986e1b88b7 ghostscript-gpl-8.60-r1.ebuild 4737
+RMD160 5bfc7405f41f228a8d773ad840f662eeced72dbf ghostscript-gpl-8.60-r1.ebuild 4737
+SHA256 fac703c5ca84b83358010cf4b9cd541f46c62302388affbcfd70896b6e0be459 ghostscript-gpl-8.60-r1.ebuild 4737
 EBUILD ghostscript-gpl-8.60.ebuild 4493 RMD160 ae922fdb94f314e180bc94c96ae4796ad2981158 SHA1 361fe20dc8a2cc2810502e798db20e9718d4df33 SHA256 be31536f7b5d1d50120a64820200e666edf5d93dd73213882df0b312a67da190
 MD5 0a5cc840a17c94d4cfef598a421f4ec7 ghostscript-gpl-8.60.ebuild 4493
 RMD160 ae922fdb94f314e180bc94c96ae4796ad2981158 ghostscript-gpl-8.60.ebuild 4493
 SHA256 be31536f7b5d1d50120a64820200e666edf5d93dd73213882df0b312a67da190 ghostscript-gpl-8.60.ebuild 4493
-MISC ChangeLog 5373 RMD160 536ac7f6bb0b803b7a0a225c580940905c9478dd SHA1 044090cd62e07a57a7aa836808ab1cfe97128991 SHA256 34375b91e94e5043076dd6a28bcc28897d6f3f9cf46331cf2ad81fe8e57e78e4
-MD5 c958027d6e85496b64ec9c6b077acda0 ChangeLog 5373
-RMD160 536ac7f6bb0b803b7a0a225c580940905c9478dd ChangeLog 5373
-SHA256 34375b91e94e5043076dd6a28bcc28897d6f3f9cf46331cf2ad81fe8e57e78e4 ChangeLog 5373
+MISC ChangeLog 5854 RMD160 4e364e0d1a1caef3b3a56cca7c0771f50b604edc SHA1 685b1cb2791c5f861615c392f3467b1dec7e1a93 SHA256 2d0c1d50c86e0c9a9186ff4bfb77bcf47f7c5290fac58b1914bdcace79350fb0
+MD5 913300f49e2f99aab2c9e2528ee80ae5 ChangeLog 5854
+RMD160 4e364e0d1a1caef3b3a56cca7c0771f50b604edc ChangeLog 5854
+SHA256 2d0c1d50c86e0c9a9186ff4bfb77bcf47f7c5290fac58b1914bdcace79350fb0 ChangeLog 5854
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -117,16 +126,15 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 72fa7407fadfed6cddb7ba1e3699e1e8 files/digest-ghostscript-gpl-8.54 1488
 RMD160 46ca437705ffcb2a1489ad1b541222493b273c34 files/digest-ghostscript-gpl-8.54 1488
 SHA256 0c2f61b7b0575c76d83fbfd9ddddb87b151118444609d0f3ae55fba35587f7c4 files/digest-ghostscript-gpl-8.54 1488
-MD5 55331e222ea7c63743453ec4aee0658a files/digest-ghostscript-gpl-8.57 1476
-RMD160 ac943d61c81167cab7007e993f56b663057059f4 files/digest-ghostscript-gpl-8.57 1476
-SHA256 173e6238b3990e0e9b71b04d108159d2fb6457f866be92571aa810360a2c0b0a files/digest-ghostscript-gpl-8.57 1476
+MD5 72fa7407fadfed6cddb7ba1e3699e1e8 files/digest-ghostscript-gpl-8.54-r1 1488
+RMD160 46ca437705ffcb2a1489ad1b541222493b273c34 files/digest-ghostscript-gpl-8.54-r1 1488
+SHA256 0c2f61b7b0575c76d83fbfd9ddddb87b151118444609d0f3ae55fba35587f7c4 files/digest-ghostscript-gpl-8.54-r1 1488
+MD5 55331e222ea7c63743453ec4aee0658a files/digest-ghostscript-gpl-8.57-r1 1476
+RMD160 ac943d61c81167cab7007e993f56b663057059f4 files/digest-ghostscript-gpl-8.57-r1 1476
+SHA256 173e6238b3990e0e9b71b04d108159d2fb6457f866be92571aa810360a2c0b0a files/digest-ghostscript-gpl-8.57-r1 1476
 MD5 ad2c51586f706c781698d86b63308fe2 files/digest-ghostscript-gpl-8.60 1000
 RMD160 f314aa1cac8387a24be632548a20249212f16cc7 files/digest-ghostscript-gpl-8.60 1000
 SHA256 2b6a56bd1d93f9fce20899b6e023e9e3e25bcd96d7d30a414d73c9dde39e6a29 files/digest-ghostscript-gpl-8.60 1000
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHKdEiNQqtfCuFneMRArtOAKCQkj51G3db4lN2jM+erczP6hAU+gCeLAIt
-xrh2hOtOkMFImN6/ldqcNxw=
-=vk6B
------END PGP SIGNATURE-----
+MD5 ad2c51586f706c781698d86b63308fe2 files/digest-ghostscript-gpl-8.60-r1 1000
+RMD160 f314aa1cac8387a24be632548a20249212f16cc7 files/digest-ghostscript-gpl-8.60-r1 1000
+SHA256 2b6a56bd1d93f9fce20899b6e023e9e3e25bcd96d7d30a414d73c9dde39e6a29 files/digest-ghostscript-gpl-8.60-r1 1000
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54-r1 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54-r1
new file mode 100644
index 000000000000..f7be16b158b0
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54-r1
@@ -0,0 +1,18 @@
+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 dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz 5001983
+RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 adobe-cmaps-200406.tar.gz 5001983
+SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689 adobe-cmaps-200406.tar.gz 5001983
+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 ecf57b4597f1d8c54ba8e6068a9119ab gdevhl12.c.gz 7613
+RMD160 3adffbf7df824abd02242dadf847b09246f411bb gdevhl12.c.gz 7613
+SHA256 3905677ab494a1b82ee2a6cc78975a5fdc08d81a65c12af35746bb3d2889b3e2 gdevhl12.c.gz 7613
+MD5 5d0ad0da8297fe459a788200f0eaeeba ghostscript-8.54-gpl.tar.bz2 12365361
+RMD160 f61f6da568ffe440a466cd0d7b5871a3d87d1116 ghostscript-8.54-gpl.tar.bz2 12365361
+SHA256 64f43553223390a3e519efed2b3dfee8a4c79df5a373a0e96861483565957e1b ghostscript-8.54-gpl.tar.bz2 12365361
+MD5 46bce036ad0b9b284f4c8f3530f7c684 gsdjvu-1.1.tar.gz 214364
+RMD160 aa1ff4a80b02b16e43bf8e14719613f98bdf13c6 gsdjvu-1.1.tar.gz 214364
+SHA256 39f32b9946a65cbe8d5b7c2882ef0e82d5858e78e04b568bb525d2c4e2d6ce78 gsdjvu-1.1.tar.gz 214364
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.57 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.57-r1
index d3683e037e1b..d3683e037e1b 100644
--- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.57
+++ b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.57-r1
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60-r1 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60-r1
new file mode 100644
index 000000000000..a6cd5c99e4c8
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60-r1
@@ -0,0 +1,12 @@
+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 dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz 5001983
+RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 adobe-cmaps-200406.tar.gz 5001983
+SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689 adobe-cmaps-200406.tar.gz 5001983
+MD5 89fc0a90e67caf151a9d6855200c68ca ghostscript-8.60.tar.bz2 12942029
+RMD160 208168fcd6bc5fd931d15b288ce9324f59ba07a3 ghostscript-8.60.tar.bz2 12942029
+SHA256 f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a ghostscript-8.60.tar.bz2 12942029
+MD5 cbb24f8c50b5a94ecf1635048d2f11d6 gsdjvu-1.2.tar.gz 214539
+RMD160 6cf27e95955b5ae0cc15dacc36ce514ff8347ab0 gsdjvu-1.2.tar.gz 214539
+SHA256 ab4a81eddb44241bb71b5ec813242036312effc9eb1b343b3c257fb563fa8a49 gsdjvu-1.2.tar.gz 214539
diff --git a/app-text/ghostscript-gpl/files/ghostscript-CVE-2007-2721.patch b/app-text/ghostscript-gpl/files/ghostscript-CVE-2007-2721.patch
new file mode 100644
index 000000000000..799bf51ee63f
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-CVE-2007-2721.patch
@@ -0,0 +1,47 @@
+--- /trunk/gs/jasper/src/libjasper/jp2/jp2_cod.c	2007/10/17 18:27:58	8297
++++ trunk/gs/jasper/src/libjasper/jp2/jp2_cod.c	2007/10/17 23:04:50	8298
+@@ -247,7 +247,7 @@
+ 	box = 0;
+ 	tmpstream = 0;
+ 
+-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
++	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
+ 		goto error;
+ 	}
+ 	box->ops = &jp2_boxinfo_unk.ops;
+--- /trunk/gs/jasper/src/libjasper/jpc/jpc_cs.c	2007/10/17 18:27:58	8297
++++ trunk/gs/jasper/src/libjasper/jpc/jpc_cs.c	2007/10/17 23:04:50	8298
+@@ -991,7 +991,10 @@
+ 		compparms->numstepsizes = (len - n) / 2;
+ 		break;
+ 	}
+-if (compparms->numstepsizes > 0) {
++if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
++		jpc_qcx_destroycompparms(compparms);
++                return -1;
++        } else if (compparms->numstepsizes > 0) {
+ 	compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+ 	  sizeof(uint_fast32_t));
+ 	assert(compparms->stepsizes);
+--- /trunk/gs/jasper/src/libjasper/jpc/jpc_dec.c	2007/10/17 18:27:58	8297
++++ trunk/gs/jasper/src/libjasper/jpc/jpc_dec.c	2007/10/17 23:04:50	8298
+@@ -1219,7 +1219,7 @@
+ 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
+ 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
+ 	dec->numtiles = dec->numhtiles * dec->numvtiles;
+-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
++	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
+ 		return -1;
+ 	}
+ 
+@@ -1243,7 +1243,7 @@
+ 		tile->pkthdrstreampos = 0;
+ 		tile->pptstab = 0;
+ 		tile->cp = 0;
+-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
++		if (!(tile->tcomps = jas_calloc(dec->numcomps,
+ 		  sizeof(jpc_dec_tcomp_t)))) {
+ 			return -1;
+ 		}
+ 
+
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.54-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.54-r1.ebuild
new file mode 100644
index 000000000000..a8be0abdf877
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.54-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.54-r1.ebuild,v 1.1 2007/11/02 20:39:17 tgurr Exp $
+
+WANT_AUTOMAKE=1.6
+
+inherit autotools elisp-common eutils versionator flag-o-matic
+
+DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed"
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/"
+
+GSDJVU_PV=1.1
+CUPS_PV=1.1.23
+MY_P=ghostscript-${PV}-gpl
+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 )
+		djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )
+	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/gdevhl12.c.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86 ~x86-fbsd"
+IUSE="X cups cjk gtk djvu 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 )
+	djvu? ( app-text/djvu )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	cups? ( >=net-print/cups-1.1.20 )
+	jpeg2k? ( media-libs/jasper )
+	!app-text/ghostscript-esp
+	!app-text/ghostscript-gnu"
+
+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 ${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
+
+	# 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 djvu; then
+		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/src"
+		epatch "${FILESDIR}/djvu-gs-gpl.patch"
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
+		cp "${S}/src/contrib.mak" "${S}/src/contrib.mak.gsdjvu"
+		grep -q djvusep "${S}/src/contrib.mak" || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/src/contrib.mak"
+	fi
+
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-cups-lib.patch"
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-big-cmap-post.patch"
+
+	# enable cfax device (bug #56704) and rinkj device
+	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:\0 $(DD)cfax.dev $(DD)rinkj.dev:' "${S}/src/Makefile.in" || die "sed failed"
+
+	# http://www.linuxprinting.org/download/printing/ghostscript-8.x/drivers/hl1250
+	# http://bugs.ghostscript.com/show_bug.cgi?id=687484
+	cp "${WORKDIR}/gdevhl12.c" "${S}/src/gdevhl12.c" || die
+	cat "${FILESDIR}/gdevhl12-hl1250.mak" >> "${S}/src/contrib.mak" || die
+	sed -e 's#^\(DEVICE_DEVS6=.*\)$#\1 $(DD)hl1240.dev $(DD)hl1250.dev#' \
+		-i "${S}/src/Makefile.in"  || die
+	sed -i -e "s:#if 1:#if 0:" "${S}/src/gdevhl12.c" || die
+
+	# #128650, #128645, http://bugs.ghostscript.com/show_bug.cgi?id=688703
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-ps2epsi-afpl.diff"
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-rinkj.patch"
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-destdir.diff"
+
+	# already fixed inSVN, http://bugs.ghostscript.com/show_bug.cgi?id=688702
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-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
+
+	# fixed inSVN http://bugs.ghostscript.com/show_bug.cgi?id=688721
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-segfault.patch"
+
+	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:" \
+		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"
+
+	if use djvu; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g'		Makefile
+		sed -i -e 's:(/\(Resource/[a-zA-Z/]*\)):(\1) findlibfile {pop} {pop &}
+		ifelse:' lib/gs_res.ps
+	fi
+
+	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 soinstall || die "emake install failed"
+
+	use djvu && dobin gsdjvu
+
+	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-gpl/ghostscript-gpl-8.57.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.57-r1.ebuild
index 1610c3388e42..5cf890e3d2cf 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.57.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.57-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.57.ebuild,v 1.5 2007/08/15 12:24:38 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.57-r1.ebuild,v 1.1 2007/11/02 20:39:17 tgurr Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -51,18 +51,18 @@ S=${WORKDIR}/${P/-gpl}
 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
+		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}
+		cd "${WORKDIR}"
 	fi
 
 	# cups support
 	if use cups; then
 		cp -r cups-${CUPS_PV}/pstoraster "${S}"
-		cd "${S}"/pstoraster
+		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"
@@ -70,8 +70,8 @@ src_unpack() {
 			-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
+		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"
@@ -87,30 +87,30 @@ src_unpack() {
 	if ! use bindist && use djvu; then
 		unpack gsdjvu-${GSDJVU_PV}.tar.gz
 		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/src
-		epatch "${FILESDIR}"/djvu-gs-gpl.patch
-		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
-		cp "${S}"/src/contrib.mak "${S}"/src/contrib.mak.gsdjvu
-		grep -q djvusep "${S}"/src/contrib.mak || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/src/contrib.mak
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/src"
+		epatch "${FILESDIR}/djvu-gs-gpl.patch"
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
+		cp "${S}/src/contrib.mak" "${S}/src/contrib.mak.gsdjvu"
+		grep -q djvusep "${S}/src/contrib.mak" || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/src/contrib.mak"
 	fi
 
-	epatch "${FILESDIR}"/ghostscript-afpl-8.57-cups-lib.patch
-#	epatch "${FILESDIR}"/ghostscript-afpl-8.54-big-cmap-post.patch
+	epatch "${FILESDIR}/ghostscript-afpl-8.57-cups-lib.patch"
 
 	# enable cfax device (bug #56704) and rinkj device
 	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:\0 $(DD)cfax.dev $(DD)rinkj.dev:' \
-		"${S}"/src/Makefile.in || die "sed failed"
+		"${S}/src/Makefile.in" || die "sed failed"
 
 	# http://www.linuxprinting.org/download/printing/ghostscript-8.x/drivers/hl1250
 	# http://bugs.ghostscript.com/show_bug.cgi?id=687484
-	cp ${WORKDIR}/gdevhl12.c "${S}"/src/gdevhl12.c || die
-	cat "${FILESDIR}"/gdevhl12-hl1250.mak >> "${S}"/src/contrib.mak || die
+	cp "${WORKDIR}/gdevhl12.c" "${S}/src/gdevhl12.c" || die
+	cat "${FILESDIR}/gdevhl12-hl1250.mak" >> "${S}/src/contrib.mak" || die
 	sed -e 's#^\(DEVICE_DEVS6=.*\)$#\1 $(DD)hl1240.dev $(DD)hl1250.dev#' \
-		-i "${S}"/src/Makefile.in  || die
-	sed -i -e "s:#if 1:#if 0:" "${S}"/src/gdevhl12.c || die
+		-i "${S}/src/Makefile.in"  || die
+	sed -i -e "s:#if 1:#if 0:" "${S}/src/gdevhl12.c" || die
 
-	epatch "${FILESDIR}"/ghostscript-afpl-8.54-rinkj.patch
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-rinkj.patch"
+	epatch "${FILESDIR}/ghostscript-CVE-2007-2721.patch"
 
 	if ! use gtk; then
 		sed -i "s:\$(GSSOX)::" src/*.mak || die "gsx sed failed"
@@ -153,9 +153,9 @@ src_install() {
 		dobin gsdjvu
 	fi
 
-	rm -fr "${D}"/usr/share/doc/${PF}/html/{README,PUBLIC}
+	rm -fr "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
 	dodoc doc/README
 
-	cd ${S}/ijs
+	cd "${S}/ijs"
 	emake DESTDIR="${D}" install || die "emake ijs install failed"
 }
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.60-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.60-r1.ebuild
new file mode 100644
index 000000000000..d79e8d9d3b4c
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.60-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.60-r1.ebuild,v 1.1 2007/11/02 20:39:17 tgurr Exp $
+
+inherit autotools elisp-common eutils versionator flag-o-matic
+
+DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed"
+HOMEPAGE="http://ghostscript.com"
+
+MY_P=${P/-gpl}
+GSDJVU_PV=1.2
+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 )
+	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bindist cjk cups djvu gtk jpeg2k X"
+
+COMMON_DEPEND="media-libs/fontconfig
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.5
+	>=media-libs/tiff-3.7
+	>=sys-libs/zlib-1.1.4
+	!bindist? ( djvu? ( app-text/djvu ) )
+	cups? ( >=net-print/cups-1.1.20 )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	jpeg2k? ( media-libs/jasper )
+	X? ( x11-libs/libXt x11-libs/libXext )
+	!app-text/ghostscript-esp
+	!app-text/ghostscript-gnu"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
+	media-fonts/gnu-gs-fonts-std"
+
+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}"
+
+	# Fedora patches
+	# upstream bug http://bugs.ghostscript.com/show_bug.cgi?id=689393
+	epatch "${FILESDIR}/ghostscript-8.60-ijs-krgb.patch"
+	epatch "${FILESDIR}/ghostscript-8.60-fPIC.patch"
+	epatch "${FILESDIR}/ghostscript-8.60-multilib.patch"
+	epatch "${FILESDIR}/ghostscript-8.60-noopt.patch"
+	epatch "${FILESDIR}/ghostscript-8.60-scripts.patch"
+
+	# additional Gentoo patches
+	epatch "${FILESDIR}/ghostscript-afpl-8.54-rinkj.patch"
+
+	# Already fixed upstream for the next release
+	epatch "${FILESDIR}/ghostscript-8.60-include.patch"
+	epatch "${FILESDIR}/ghostscript-CVE-2007-2721.patch"
+
+	if use bindist && use djvu ; then
+		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
+		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+	fi
+
+	if ! use bindist && use djvu ; then
+		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/src"
+		epatch "${FILESDIR}/djvu-gs-gpl-8.60.patch"
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
+		cp "${S}/src/contrib.mak" "${S}/src/contrib.mak.gsdjvu"
+		grep -q djvusep "${S}/src/contrib.mak" || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/src/contrib.mak"
+
+		# install ps2utf8.ps, bug #197818
+		sed -i -e '/$(EXTRA_INIT_FILES)/aps2utf8.ps \\' \
+		"${S}/src/unixinst.mak" || die "sed failed"
+	fi
+
+	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:" \
+		src/Makefile.in src/*.mak || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable cups) \
+		$(use_enable gtk) \
+		$(use_with jpeg2k jasper) \
+		$(use_with X x) \
+		--enable-dynamic \
+		--enable-fontconfig \
+		--with-drivers=ALL,rinkj \
+		--with-ijs \
+		--with-jbig2dec \
+	|| die "econf failed"
+
+	if ! use bindist && use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g'		Makefile
+		sed -i -e 's:(/\(Resource/[a-zA-Z/]*\)):(\1) findlibfile {pop} {pop &}
+		ifelse:' lib/gs_res.ps
+	fi
+
+	emake -j1 so all || die "emake failed"
+
+	cd "${S}/ijs"
+	econf || die "ijs econf failed"
+	emake || die "ijs emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install || die "emake install failed"
+
+	if ! use bindist && use djvu ; then
+		dobin gsdjvu || die "dobin gsdjvu install failed"
+	fi
+
+	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
+	dodoc doc/README || die "dodoc install failed"
+
+	cd "${S}/ijs"
+	emake DESTDIR="${D}" install || die "emake ijs install failed"
+}