Only unpack cjk patch if cjk flag is set for bug 120888.

Package-Manager: portage-2.0.54

3 files changed, 10 insertions, 85 deletions

diff --git a/app-text/ghostscript-esp/ChangeLog b/app-text/ghostscript-esp/ChangeLog
index 05e7de1cbd72..a4e6259d27f0 100644
--- a/app-text/ghostscript-esp/ChangeLog
+++ b/app-text/ghostscript-esp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ChangeLog,v 1.6 2006/01/29 23:31:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ChangeLog,v 1.7 2006/01/30 01:19:21 vanquirius Exp $
+
+  30 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  ghostscript-esp-7.07.1-r8.ebuild:
+  Only unpack cjk patch if cjk flag is set for bug 120888. Thanks to Robert
+  Trace <gentoobugs at farcaster dot org>.
 
   29 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
   ghostscript-esp-7.07.1-r7.ebuild:
diff --git a/app-text/ghostscript-esp/Manifest b/app-text/ghostscript-esp/Manifest
index 4e842910ed09..601aaaf85788 100644
--- a/app-text/ghostscript-esp/Manifest
+++ b/app-text/ghostscript-esp/Manifest
@@ -1,120 +1,40 @@
-MD5 187d0fc5188e396c4df50dbec8562c49 ChangeLog 21329
-RMD160 4811af252550d2167557c01fafb2fb464cc5e5d9 ChangeLog 21329
-SHA256 66545e2495ac13b31f852cb72984cd07abb53d196d809c8fb1b010ab6edd814e ChangeLog 21329
+MD5 efe479a4bd7f2138da9ec98e2cd899ee ChangeLog 21540
 MD5 db00eb9aaf23133f903513fea669954f files/digest-ghostscript-esp-7.07.1-r10 212
-RMD160 6b2190a80e931bbea33eeaaff21ebab231bfe391 files/digest-ghostscript-esp-7.07.1-r10 212
-SHA256 cd015ae840c870d1561360c4de363612d13f234d0d04ced7e9e25a0f72087bd2 files/digest-ghostscript-esp-7.07.1-r10 212
 MD5 30345d26bed661b454f0bdba79f17947 files/digest-ghostscript-esp-7.07.1-r7 418
-RMD160 33ce91e019ec61c18689fdcefdde461043d4dcbd files/digest-ghostscript-esp-7.07.1-r7 418
-SHA256 45d1fc2a4c7be7bfa5e7419fe66b84a46c330e118b6df7adfd0d308c8e012c9f files/digest-ghostscript-esp-7.07.1-r7 418
 MD5 8a8b22c873ff3d086435ee8c8e419f1c files/digest-ghostscript-esp-7.07.1-r8 276
-RMD160 a43efc6be1b45a8f4ebcae3944d140cd326e4cc5 files/digest-ghostscript-esp-7.07.1-r8 276
-SHA256 a43e8dfbdd146fde3478b5555ec531265a1b901a7349a75d9fc1075c8e89070b files/digest-ghostscript-esp-7.07.1-r8 276
 MD5 d103f68902b401dd7844a93d16b174c1 files/digest-ghostscript-esp-8.15.1 212
-RMD160 66d3b2260bdf5b6cee1e8123a288fc950e2716fd files/digest-ghostscript-esp-8.15.1 212
-SHA256 78c20372c3500ca3339b6257ffd85f358c730ad7965a156a89a5badf251c0703 files/digest-ghostscript-esp-8.15.1 212
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
-RMD160 8da05491113dfcca77da4e37c01651ff54cc86e0 files/ghostscript-7.05.6.man.patch 1231
-SHA256 4873defc3d4bee0db4cb6b9e34e481f0de5914aef9a4b7cbf58677b6bfb9d528 files/ghostscript-7.05.6.man.patch 1231
 MD5 f834d056ca972c457a2ff3b1e839e562 files/ghostscript-7.07-bigposttable.patch 1257
-RMD160 debf94d7b675769daade38706ea5abff8b08926e files/ghostscript-7.07-bigposttable.patch 1257
-SHA256 b48748f917cf605653cb37a387777cb94501b69ac37726ac5f8bba957f264501 files/ghostscript-7.07-bigposttable.patch 1257
 MD5 55146a1eafc4ad3a26d99121ae0777fe files/ghostscript-7.07-coverage-glyphcount.patch 3100
-RMD160 6861cbf2e8f4b6edfdd9c0dfed491f4a37cd8389 files/ghostscript-7.07-coverage-glyphcount.patch 3100
-SHA256 503f4a1ea35a1f7dc0c0a6652f9e39d15ee98f962fde15023eb4d8af1659b9fd files/ghostscript-7.07-coverage-glyphcount.patch 3100
 MD5 c73ad916d49df447de59358ffdc495eb files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch 6462
-RMD160 256f6e05ff0e7a22ce71257618e9f1603c51cc14 files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch 6462
-SHA256 e57458557bc34cc45a599ec2b177e7e5baf24b476bea736aef67d12249d93692 files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch 6462
 MD5 e0da7576378dc87fa53a16dfd1774789 files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch 1611
-RMD160 b8f14e15441260d6c555d8638b2e416a9950d525 files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch 1611
-SHA256 d255342bfa9591e2f8fbe939c5cfbbffc22b689a205db630660d05d9befcde4e files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch 1611
 MD5 b37c0dc9f85205da6e8675d4a8bfd21a files/ghostscript-7.07-gsublookuptable.patch 3808
-RMD160 1dada89864fabe4e00646830756e9c4664614f77 files/ghostscript-7.07-gsublookuptable.patch 3808
-SHA256 434cba7d35539dc3e69fe8e2804be777b48e9773515c4353cc4f6f045573d5fb files/ghostscript-7.07-gsublookuptable.patch 3808
 MD5 f3a75fcde50479b3f58871663272924c files/ghostscript-badc.patch 905
-RMD160 1212ee41eed694c39851360e2bc15642d96a1b43 files/ghostscript-badc.patch 905
-SHA256 774f9d1cb02a8fc3dd74eea14edf1d3c6d19a042d62cc0dfa771531aefc078c0 files/ghostscript-badc.patch 905
 MD5 1fa0a00ca3a3f906f0ac62dc961e78d8 files/ghostscript-build.patch 1968
-RMD160 0b3f0841f22a648046680fc2dc12a90653f454d5 files/ghostscript-build.patch 1968
-SHA256 2c197e3f1e84193eb011212b604c4b9abc092cb00f8c56438ed418dbad58ed76 files/ghostscript-build.patch 1968
 MD5 5b476654e84a9748e3d56d86f264b277 files/ghostscript-esp-7.07.1-64bit-cmyk.patch 1777
-RMD160 6b59d9b2583c8fbc00ad1267809b815f167c27e9 files/ghostscript-esp-7.07.1-64bit-cmyk.patch 1777
-SHA256 6261f97860549cfd27ed5c0c9a2967bf00a58076c38529828ce99e794ab083b1 files/ghostscript-esp-7.07.1-64bit-cmyk.patch 1777
 MD5 e8974faf06541ccb8c271180d87175bd files/ghostscript-gtk2.patch 610
-RMD160 b6f6ff2b5667e698d38c6340fcb027e381e765de files/ghostscript-gtk2.patch 610
-SHA256 5330aedcdccc78af21d87179f93917d0e025a41bcce3b863301bdd0e4f9d23ea files/ghostscript-gtk2.patch 610
 MD5 01cfb541633de9580aa5151543a0075f files/ghostscript-noopt.patch 557
-RMD160 579feb72d004e49ed8058c2ce75a16fd47242a49 files/ghostscript-noopt.patch 557
-SHA256 0fcfd6fb8e80440d49d55bf6d7f50dda831824ce2093f2ebdac8b302dc4c2a59 files/ghostscript-noopt.patch 557
 MD5 83a8ae09246090685c93fcf85fda8301 files/ghostscript-pagesize.patch 475
-RMD160 deaceb77737316621fe31aab5af595ca51bfffe8 files/ghostscript-pagesize.patch 475
-SHA256 dc6383cfb751ceb56f3fa4ae6dfcfd24ca2eadd8b9b10f96e92e756e4e66178f files/ghostscript-pagesize.patch 475
 MD5 8cd1807897a48d3bfb9767309594969b files/ghostscript-ps2epsi.patch 354
-RMD160 494d16f1f02d424529bde6974a06a0ce23ea4a04 files/ghostscript-ps2epsi.patch 354
-SHA256 f25b27b4ccfbeba1a9e3c889f5279638e530382a96d40dbb9c35a576247b212f files/ghostscript-ps2epsi.patch 354
 MD5 9d3484ccc9ea57948e8e54cc838938c4 files/ghostscript-scripts.patch 1038
-RMD160 0ba82be73579c7219f3cc37fb1e1e811481bfa0a files/ghostscript-scripts.patch 1038
-SHA256 7a38bd66be3845b3d3573d38058e0d96bd9f7992ce483dc2093b33764d90c657 files/ghostscript-scripts.patch 1038
 MD5 f4b3fd94487ade5bb11a91a4037b5e0c files/ghostscript-split-font-configuration.patch 2120
-RMD160 800bba3734562dd5ccbd9c4fce06ef3d1e2a0ea4 files/ghostscript-split-font-configuration.patch 2120
-SHA256 2c40444912e8025fca256db11ba885bc7750a8be2aeb49ef4fcc38e2d7bb1f2f files/ghostscript-split-font-configuration.patch 2120
 MD5 2860ac190e2737c358b105c31152a1c8 files/ghostscript-use-external-freetype.patch 2778
-RMD160 2eb39bdbecb6eb8ce565246dd42886bd4dff69ca files/ghostscript-use-external-freetype.patch 2778
-SHA256 325c8172d9c9dfa104749654d96443b835ecc980a227dbf7112bac205084b1f5 files/ghostscript-use-external-freetype.patch 2778
 MD5 4232a57145c2eafd1d84eabd674190f9 files/gs-8.15.1destdir.patch 13364
-RMD160 abc921b811f268540a33703bb25036753b6cbd48 files/gs-8.15.1destdir.patch 13364
-SHA256 cff8a27d340a71cb78c5602f4fa219b35a0456187a2244385cb9e183ba1080a2 files/gs-8.15.1destdir.patch 13364
 MD5 8c6a3d7e8897b4297ef853dbd89e408b files/gs-fix-gc.patch 5627
-RMD160 ac6aee1b2e861b1b09f6fa8648f62ad91d016571 files/gs-fix-gc.patch 5627
-SHA256 ea02e3f1d06757b54608c0bc74918f61b4a87831f901735c14f6e53d47edfc06 files/gs-fix-gc.patch 5627
 MD5 186fc94fd3208e808026580e7436dbdc files/gs-osx-ijs.patch 1566
-RMD160 0322445287ad8fab5c4087d8abdfb5f0252acdcb files/gs-osx-ijs.patch 1566
-SHA256 1901fccff7da41b510898187146c20147fe67df3a46fa6efaa78bfc2439901a1 files/gs-osx-ijs.patch 1566
 MD5 212a5ece7d789ef9d04e15fd7d36eea3 files/gs-osx-unix-dll.patch 1930
-RMD160 3f5d85cb5fbb913a4a8447ab71647a8ee22945e6 files/gs-osx-unix-dll.patch 1930
-SHA256 ae2e8ca75355f008886ae1b6d4fb669cf6f2edca489d13f88a47345874366c25 files/gs-osx-unix-dll.patch 1930
 MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
-RMD160 a9d446bc33ce5ad774783d340dc1fb1cca3e5422 files/gs7.05.6-gdevpx.patch 402
-SHA256 17d6ed39c3aa4828dd8370972901d903ce110a8d1837ea76fd0e5317c6d98241 files/gs7.05.6-gdevpx.patch 402
 MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
-RMD160 6ad8ea72aee76ca19d71db4d56bd31138a398731 files/gs7.05.6-kochi-substitute.patch 3774
-SHA256 f141027aadc46be4fa8678d515ef9fe429ef076a778725978acdd82a1705af68 files/gs7.05.6-kochi-substitute.patch 3774
 MD5 2493e94ef0a73a577e29a8c487c856bb files/gs7.05.6-tempfile.patch 2765
-RMD160 64642907afc5939ce13decfdde252d0a70591a36 files/gs7.05.6-tempfile.patch 2765
-SHA256 6502490bbc4cd394f4f3bcd742207252da8f0cfec3ec4bdcdc5e8d5d56894afc files/gs7.05.6-tempfile.patch 2765
 MD5 16ff6a37a0a334e97f712d8ed530ec6c files/gs7.07.1-cjk.diff 7264
-RMD160 5ddbb4fc659fe8483580c86543d9c261859c3154 files/gs7.07.1-cjk.diff 7264
-SHA256 96e2c271eed07d7961bbcf2fc31f3adabac36709a4466a179f7f6a2a86faf3e5 files/gs7.07.1-cjk.diff 7264
 MD5 51736590c7ec64f9029fa9524e1ab50c files/gs7.07.1-destdir.patch 12261
-RMD160 1df88c5e630af5aa4ae0429d7ea931ebeaca1d03 files/gs7.07.1-destdir.patch 12261
-SHA256 bb4f4efaaaddcea6fa3c0d4656c808889cc256a07aa8edd5c248b2ee92ec17f2 files/gs7.07.1-destdir.patch 12261
 MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
-RMD160 fc9701c87ffdda1ee890abc72ad5da4fe27e9bf0 files/gs7.07.1-ijs.patch 401
-SHA256 a8e5a89afd6c23cbe9ead87d8e3d1cc60a84f4da7885c8df119146f6ce0a057f files/gs7.07.1-ijs.patch 401
 MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
-RMD160 0935b674e98afc965fc8186394247d15bd898c72 files/gs7.07.1-ijsdestdir.patch 1418
-SHA256 edd210b7c9c9b80187154dfae6d4771af0bce78071f08c27648e0499f2d2680b files/gs7.07.1-ijsdestdir.patch 1418
 MD5 92fa24960f2c7802749ce6908aeaf60d files/gs7.07.1-nogtk2.patch 1419
-RMD160 5d1b45c8870dd951b2a4001a9d1c1728bb77a56d files/gs7.07.1-nogtk2.patch 1419
-SHA256 ccf8e8299e6f09aad8a3ae2608bbe4f28ba63f7b92b8da512142e786b8cec33b files/gs7.07.1-nogtk2.patch 1419
 MD5 b2ca914ffcff3e5296d6b5acc7fac182 files/gs7.07.1-ps2ps.patch 244
-RMD160 dfaa4064603530e11c5277510e89f64fca91ef30 files/gs7.07.1-ps2ps.patch 244
-SHA256 0e20ccfc0f12b269e739a6d503db7b234362bb78a453c7f9fd60ae7b3896eeb8 files/gs7.07.1-ps2ps.patch 244
 MD5 0201da09644874147627750546511c36 files/gs7.07.1-tempfile.patch 3125
-RMD160 1fbad34890612b8628f49881c07229a9a1406b4c files/gs7.07.1-tempfile.patch 3125
-SHA256 552690dbf45dd141728ad2031597d5d32cc07e041623493776efda0e223a683f files/gs7.07.1-tempfile.patch 3125
 MD5 32d445682c030ec35813551b5ddb8814 ghostscript-esp-7.07.1-r10.ebuild 6170
-RMD160 e07a1ee25fe6462f0652cc6057f548372482afdf ghostscript-esp-7.07.1-r10.ebuild 6170
-SHA256 7d1aaff13dbd2c008b2db4f8983b8abe29ca8ebc4d55ac8da5943517fc609e17 ghostscript-esp-7.07.1-r10.ebuild 6170
 MD5 87d9695f4326a6755be96ea89362b2db ghostscript-esp-7.07.1-r7.ebuild 4605
-RMD160 233f555fe0145a7ade31d07fd8986a71756e84eb ghostscript-esp-7.07.1-r7.ebuild 4605
-SHA256 b1e86962359aaecc075e08efb1a217d7e2f4a5569519c14874f4f6de510d24a1 ghostscript-esp-7.07.1-r7.ebuild 4605
-MD5 9802d49a4041c0988c0cf02d2667d2f8 ghostscript-esp-7.07.1-r8.ebuild 5613
-RMD160 50c0b10c13eb60047255978b63bcb77cbe86c2f4 ghostscript-esp-7.07.1-r8.ebuild 5613
-SHA256 f6f5a9f55936f021b2a5b5b2437b37ed34e4f5e979b623b43d8c1a757038b0ed ghostscript-esp-7.07.1-r8.ebuild 5613
+MD5 b584da4517292459eafdb80487029115 ghostscript-esp-7.07.1-r8.ebuild 5617
 MD5 d3b90c0d4e5b5d12c622c83579d3201a ghostscript-esp-8.15.1.ebuild 4194
-RMD160 84dc499bd3dccc8057ebdaac7c91f83c09cedc80 ghostscript-esp-8.15.1.ebuild 4194
-SHA256 a716fe914149ce301085eb7412a8e096630422132f59583ea0a290aeab9998dd ghostscript-esp-8.15.1.ebuild 4194
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
-SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
diff --git a/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild b/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild
index a183df171d54..f417d0f7c17c 100644
--- a/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild
+++ b/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild,v 1.4 2006/01/29 23:38:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild,v 1.5 2006/01/30 01:19:21 vanquirius Exp $
 
 inherit flag-o-matic eutils toolchain-funcs libtool
 
@@ -45,7 +45,6 @@ PROVIDE="virtual/ghostscript"
 
 src_unpack() {
 	unpack espgs-${PV}-source.tar.bz2
-	unpack gs7.07.1-cjk.diff.bz2
 
 	cd ${S}
 
@@ -59,6 +58,7 @@ src_unpack() {
 	fi
 
 	if use cjk ; then
+		unpack gs7.07.1-cjk.diff.bz2
 		epatch ${WORKDIR}/gs7.07.1-cjk.diff
 		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
 	fi