clean up and readd sparc-fbsd

Package-Manager: portage-2.1.3.19

11 files changed, 20 insertions, 750 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 8137837832a6..179ded0209a2 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.39 2008/01/23 22:22:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.40 2008/01/23 22:33:42 opfer Exp $
+
+  23 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
+  -ghostscript-gpl-8.54.ebuild, -ghostscript-gpl-8.54-r1.ebuild,
+  -ghostscript-gpl-8.57-r1.ebuild, -ghostscript-gpl-8.60-r1.ebuild,
+  ghostscript-gpl-8.61-r1.ebuild:
+  clean up and readd sparc-fbsd
 
   23 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
   ghostscript-gpl-8.61-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index b4b47c382114..e8b1508d7371 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -91,63 +91,28 @@ RMD160 8e1b461f58df3282768c20b988312ec37cf3bbdf files/ghostscript-esp-8.15.2-cid
 SHA256 1773c5e7f0f7088434d7a1cc8e27850225b57500cf9f8f2f6ea0f266daedaf5c files/ghostscript-esp-8.15.2-cidfmap.cjk 2095
 DIST acro5-cmaps-2001.tar.gz 631653 RMD160 c723afc2207157a434988b46bcf0a458281c29a4 SHA1 fbc8715eae880f59e2251ae8fa99f79fbcfbd3e5 SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4
 DIST adobe-cmaps-200406.tar.gz 5001983 RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 SHA1 b846292af4541d907dd9041e397c2f1d8c72a056 SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689
-DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
-DIST gdevhl12.c.gz 7613 RMD160 3adffbf7df824abd02242dadf847b09246f411bb SHA1 b5ac9ebe654b0ace453f1aec501dd363311efeed SHA256 3905677ab494a1b82ee2a6cc78975a5fdc08d81a65c12af35746bb3d2889b3e2
-DIST ghostscript-8.54-gpl.tar.bz2 12365361 RMD160 f61f6da568ffe440a466cd0d7b5871a3d87d1116 SHA1 5da69b04ddc8a4660a2c40b0e561a358c737c310 SHA256 64f43553223390a3e519efed2b3dfee8a4c79df5a373a0e96861483565957e1b
-DIST ghostscript-8.57.tar.bz2 11934408 RMD160 034331d9713cb551e1081c6bd53dbe4c983c2908 SHA1 17975b561a05b036fe06c96e8efdc512b9960062 SHA256 29c4cbf8bd95a14046d72eba7edbec60ffd25c37b3b3427f7c8ad5f81636ab15
-DIST ghostscript-8.60.tar.bz2 12942029 RMD160 208168fcd6bc5fd931d15b288ce9324f59ba07a3 SHA1 f0045b5055d7f83bf34b205976f73a7dafdac863 SHA256 f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a
 DIST ghostscript-8.61.tar.bz2 13244754 RMD160 ec217b05f62f2f268a72c073f85aa95ee6f6c2aa SHA1 b05ac61885c0370e432531ffb79de349c6e8b896 SHA256 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33
 DIST ghostscript-gpl-8.61-patchset-1.tar.bz2 9620 RMD160 b7464977dfabeab461439abb93ad38856a7bc27e SHA1 2e3f246d4da0956c712be4312319606cdd45593f SHA256 f2112bcf6e837f47c035646238d255f683e54b2ee6227afe7cef2d0a8ea2705c
-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
 DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SHA1 67fcbd72ae229ff68a5d0cc482d4179e3957df61 SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2
-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-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 4749 RMD160 ab276dc68a9a46fabc9c95a55df23cad0fadfbc7 SHA1 546cccdf16327cbd231a5f560381a65b1cb6e8f2 SHA256 5b5d1e4e69175afd44ad898c84a280f87b6e58afdee661945320d583b42d7c57
-MD5 7f79ebb24170a379994c158efe9bba98 ghostscript-gpl-8.60-r1.ebuild 4749
-RMD160 ab276dc68a9a46fabc9c95a55df23cad0fadfbc7 ghostscript-gpl-8.60-r1.ebuild 4749
-SHA256 5b5d1e4e69175afd44ad898c84a280f87b6e58afdee661945320d583b42d7c57 ghostscript-gpl-8.60-r1.ebuild 4749
-EBUILD ghostscript-gpl-8.61-r1.ebuild 4612 RMD160 ab36e0598bfaff69d0aad50720741a9ced27ad6d SHA1 45f3ab089238f81a1845ef87ee642dac9a43728f SHA256 78d47c8fb1e69359e568b27429ed1122a4c841646b73c5f25d107435cb41f758
-MD5 a2a6e6aec82a0f16d6e200aee005876c ghostscript-gpl-8.61-r1.ebuild 4612
-RMD160 ab36e0598bfaff69d0aad50720741a9ced27ad6d ghostscript-gpl-8.61-r1.ebuild 4612
-SHA256 78d47c8fb1e69359e568b27429ed1122a4c841646b73c5f25d107435cb41f758 ghostscript-gpl-8.61-r1.ebuild 4612
-MISC ChangeLog 8103 RMD160 e1b71629e18070114001380fd7a2459e6eada67c SHA1 7fc0410fe2bfff8ead822f874c88dab90bd563f6 SHA256 96fc1d28c010ea3c97665f101d2865f938c02d7b385c6d07e715058bf940772b
-MD5 f632e70ca3fb81b318775a7fdae84066 ChangeLog 8103
-RMD160 e1b71629e18070114001380fd7a2459e6eada67c ChangeLog 8103
-SHA256 96fc1d28c010ea3c97665f101d2865f938c02d7b385c6d07e715058bf940772b ChangeLog 8103
+EBUILD ghostscript-gpl-8.61-r1.ebuild 4624 RMD160 32519488a9ecdd93f2bf9796dbdfbb231cbb1488 SHA1 3bd38d98d24fea12a3d4bbdbc10d179313525658 SHA256 653c96b1efc62aee3621f170ec86c03a6dd433985b7f31a244c92690e72ed699
+MD5 44b3d67127d8f6ab0bd7b26c171fa5c8 ghostscript-gpl-8.61-r1.ebuild 4624
+RMD160 32519488a9ecdd93f2bf9796dbdfbb231cbb1488 ghostscript-gpl-8.61-r1.ebuild 4624
+SHA256 653c96b1efc62aee3621f170ec86c03a6dd433985b7f31a244c92690e72ed699 ghostscript-gpl-8.61-r1.ebuild 4624
+MISC ChangeLog 8358 RMD160 82bc8b6e972ec0f3b6cd5ee1b263ff56c938bc82 SHA1 c640693622195d2c1c3370528e4a76b27457107f SHA256 5cfc0915c163ae6d6a467eccdcc1bedabb5c2c9c82cfa6057538b4ef6e26e5cf
+MD5 a22ce56dfb626bd65c2634783937a418 ChangeLog 8358
+RMD160 82bc8b6e972ec0f3b6cd5ee1b263ff56c938bc82 ChangeLog 8358
+SHA256 5cfc0915c163ae6d6a467eccdcc1bedabb5c2c9c82cfa6057538b4ef6e26e5cf ChangeLog 8358
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 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 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-r1 1000
-RMD160 f314aa1cac8387a24be632548a20249212f16cc7 files/digest-ghostscript-gpl-8.60-r1 1000
-SHA256 2b6a56bd1d93f9fce20899b6e023e9e3e25bcd96d7d30a414d73c9dde39e6a29 files/digest-ghostscript-gpl-8.60-r1 1000
 MD5 3fe2b8b8aeab833d598853a5a9e59eef files/digest-ghostscript-gpl-8.61-r1 1292
 RMD160 fe9f1b1806bc465894a8e7d61beb4f8d3c9c1c20 files/digest-ghostscript-gpl-8.61-r1 1292
 SHA256 4dd36321aa88d39108e29c59c9320505e106de99f71d1925f553f3172811cf3e files/digest-ghostscript-gpl-8.61-r1 1292
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHl743NQqtfCuFneMRAka/AJ0elgzU5QauBl00NuJajIEWzcKO0ACcDKGB
-R/HU70ARxO4qDpxFU20dTzg=
-=u/MX
+iD8DBQFHl8DtNQqtfCuFneMRAklAAJwNTf1563yi418CVeJpY9j2WOxGtACZAS+P
+o+laPCgHNV4EiJwiZvynUOw=
+=s5Pb
 -----END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54
deleted file mode 100644
index f7be16b158b0..000000000000
--- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 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.54-r1 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54-r1
deleted file mode 100644
index f7be16b158b0..000000000000
--- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 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-r1 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.57-r1
deleted file mode 100644
index d3683e037e1b..000000000000
--- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.57-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 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 cc8368863fe6b666aaf13beb83ba300a ghostscript-8.57.tar.bz2 11934408
-RMD160 034331d9713cb551e1081c6bd53dbe4c983c2908 ghostscript-8.57.tar.bz2 11934408
-SHA256 29c4cbf8bd95a14046d72eba7edbec60ffd25c37b3b3427f7c8ad5f81636ab15 ghostscript-8.57.tar.bz2 11934408
-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.60-r1 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60-r1
deleted file mode 100644
index a6cd5c99e4c8..000000000000
--- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 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/ghostscript-gpl-8.54-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.54-r1.ebuild
deleted file mode 100644
index a8be0abdf877..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.54-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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.54.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild
deleted file mode 100644
index 405d92d1ccdc..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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.ebuild,v 1.11 2007/07/04 06:38:24 genstef 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
-
-	# 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-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.57-r1.ebuild
deleted file mode 100644
index 5cf890e3d2cf..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.57-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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-r1.ebuild,v 1.1 2007/11/02 20:39:17 tgurr Exp $
-
-WANT_AUTOMAKE=1.9
-
-inherit autotools elisp-common eutils versionator flag-o-matic
-
-DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed"
-HOMEPAGE="http://ghostscript.com"
-
-GSDJVU_PV=1.1
-CUPS_PV=1.1.23
-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 ) )
-	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )
-	mirror://sourceforge/ghostscript/${P/-gpl}.tar.bz2
-	mirror://gentoo/gdevhl12.c.gz"
-
-LICENSE="GPL-2 CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="X bindist cups cjk djvu 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 )
-	!bindist? ( 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}/${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"
-		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 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.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"
-
-	# 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
-
-	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"
-		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"
-}
-
-src_compile() {
-	econf $(use_with X x) \
-		$(use_with jpeg2k jasper) \
-		--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 ijs
-	econf || die "ijs econf failed"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-#	emake DESTDIR="${D}" soinstall || die "emake soinstall failed"
-
-	if ! use bindist && use djvu ; then
-		dobin gsdjvu
-	fi
-
-	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.60-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.60-r1.ebuild
deleted file mode 100644
index f83c08c969b6..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.60-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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.10 2007/12/11 09:37:16 vapier 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="alpha amd64 arm hppa ia64 ppc ppc64 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"
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.61-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.61-r1.ebuild
index 8ca02ef0f503..f66927fa7ac3 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.61-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.61-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.61-r1.ebuild,v 1.8 2008/01/23 22:22:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.61-r1.ebuild,v 1.9 2008/01/23 22:33:42 opfer Exp $
 
 inherit autotools elisp-common eutils versionator flag-o-matic
 
@@ -18,7 +18,7 @@ SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
 
 LICENSE="GPL-2 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="bindist cjk cups djvu gtk jpeg2k X"
 
 COMMON_DEPEND="media-libs/fontconfig