Add acroread-8.1.2-r1.ebuild, fixes bug #209401 and security bug #212367. Also introd...
authorTimo Gurr <tgurr@gentoo.org>
Fri, 7 Mar 2008 20:57:52 +0000 (20:57 +0000)
committerTimo Gurr <tgurr@gentoo.org>
Fri, 7 Mar 2008 20:57:52 +0000 (20:57 +0000)
Package-Manager: portage-2.1.4.4

app-text/acroread/ChangeLog
app-text/acroread/Manifest
app-text/acroread/acroread-7.0.9-r1.ebuild [deleted file]
app-text/acroread/acroread-8.1.1-r1.ebuild [deleted file]
app-text/acroread/acroread-8.1.2-r1.ebuild [moved from app-text/acroread/acroread-8.1.1-r2.ebuild with 70% similarity]
app-text/acroread/files/acroread-expr.patch [deleted file]
app-text/acroread/files/acroread-low-startup-fontissue.patch [deleted file]
app-text/acroread/files/acroread-scim.patch [deleted file]

index dc8a2c37c0f7121a1a7f7a032725e4d7f6785be5..4cadf05b83632f99f7b005dec82b4bb642984fcc 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/acroread
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.108 2008/02/10 23:04:57 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.109 2008/03/07 20:57:51 tgurr Exp $
+
+*acroread-8.1.2-r1 (07 Mar 2008)
+
+  07 Mar 2008; Timo Gurr <tgurr@gentoo.org> -files/acroread-expr.patch,
+  -files/acroread-low-startup-fontissue.patch, -files/acroread-scim.patch,
+  -acroread-7.0.9-r1.ebuild, -acroread-8.1.1-r1.ebuild,
+  -acroread-8.1.1-r2.ebuild, +acroread-8.1.2-r1.ebuild:
+  Add acroread-8.1.2-r1.ebuild, fixes bug #209401 and security bug #212367.
+  Also introduce a minimal USE flag. Remove old versions.
 
   10 Feb 2008; Dawid Węgliński <cla@gentoo.org> acroread-8.1.2.ebuild:
   Stable on x86 (bug #170177)
index 6d7d2123bd5967099f477c509f5bba1474abd263..0030e950a5b9c5c8b450f76bdb68775849bf25a9 100644 (file)
@@ -1,55 +1,20 @@
-AUX acroread-expr.patch 959 RMD160 8ccb8bed1f96b0f75453963b40ae5f8ca198be79 SHA1 d00decfaaefa8d2679c5ab16a3731f4bb7df01c2 SHA256 2ee1362347f32d25fd0c7abdcd017d5fd997e4724ca7f58ac81fee715202261e
-AUX acroread-low-startup-fontissue.patch 355 RMD160 dff0634b7042c697d51138757119cd40013b2a63 SHA1 252584712cc9ae693c1eb8daf5a08c84bd5f705f SHA256 6011cfa9d16ba8a0669e56074c43febd89a15fe1fba43c96b8d57e68b4aa84f2
-AUX acroread-scim.patch 488 RMD160 a4b6466a2afd7be298d46aa039f3e882ea6c12ce SHA1 02bcd382bd2c25892f61af9fbba31a33ab641527 SHA256 4c826838f8ab1e8a9aa288609e04e2141308e57b4038d6e68fb0c869a6b4d808
-DIST AdobeReader_chs-7.0.9-1.i386.tar.gz 61049609 RMD160 2b810e1e3c773fe6bf57bcd0cdb11aaf0630a477 SHA1 76bfc0d1931a85493d11c25a4d7d2066f96f9935 SHA256 81b44b97111c481666b021d102ce4d9bed1ef2bdb3ac877b2d8f72f659913e60
-DIST AdobeReader_chs-8.1.1-1.i486.tar.bz2 58495315 RMD160 9d06c3fb1881bbb53550200a72c2a260344b040a SHA1 7d38099064b508eca9edbfdd22445f2de74b42db SHA256 65557de5a5946f50f8dcbb858304653f7d05523d28641ef574863632a9b9b85d
 DIST AdobeReader_chs-8.1.2-1.i486.tar.bz2 58107229 RMD160 7798f39a8d79bc38ee78fa6bdeb39b7be227ed5d SHA1 9bcbbac5cb965a1717f55d07f1b881233ee47d26 SHA256 b3ef989a66c1b2745a3c8db90d03ff046e11b98a54b26258d7c9b61841f36936
-DIST AdobeReader_cht-7.0.9-1.i386.tar.gz 56715430 RMD160 f93d1f32ae0b4ff834454669c3f8d8bcff065f52 SHA1 f66b774d8ffe24827ef0da7c1743c43ca41912b0 SHA256 2832595aef5933170c192d7f27dc8b37d0aef52a710f53f7e1c1fac059bc0db5
-DIST AdobeReader_cht-8.1.1-1.i486.tar.bz2 54353308 RMD160 b119af8cf91998a97d9572b4f0053b72dfc36c6f SHA1 9da72f46c83192b6146e4449618ca511f345019e SHA256 80829e2a1882db9e4129e68083ce9f3091a40e1441faadf3bcbf4df66db63069
 DIST AdobeReader_cht-8.1.2-1.i486.tar.bz2 54011349 RMD160 1e2e7f39030f3d9104580021fe70db9f0be9641c SHA1 bbabcfa410b527d8adccb2d8c707bf8308379c2e SHA256 bda956229a21f040a5fc2066148fa60bbd95d37616265337ae6c44d73d1a3503
-DIST AdobeReader_dan-7.0.9-1.i386.tar.gz 48129423 RMD160 f46a5e3d3c5b695431d39cc6f886763c70244f19 SHA1 ae65d075f4a968f96d97d86c6720c5f4d29a0cad SHA256 95d3e657a8e1da5aa7f32113508fc3c157e3d01d1c37a2f332227ddcec496f5c
-DIST AdobeReader_dan-8.1.1-1.i486.tar.bz2 49916168 RMD160 47c33b3d8ca769e28b8adeab0db77dff9be8fe2f SHA1 3387a7716d54d9ef1064b7067806a1f081670b58 SHA256 fb886a41bf158ff8eccac9e4aa0f979e6f3e2de72f10be6107404dc314cc5ce4
 DIST AdobeReader_dan-8.1.2-1.i486.tar.bz2 49567628 RMD160 06cc305b466f988c2729ac72c0358e7bd33aab02 SHA1 b70cee44f35e7c1ed9e911521dc29c7ef4ffa411 SHA256 299267d62292633806673fdc5aa9ebc31f47f5264ed23ae35f6e3a4fdfec8859
-DIST AdobeReader_deu-7.0.9-1.i386.tar.gz 49388396 RMD160 6da97fb8349df8215a28118ad86bf997e44d9622 SHA1 a41e1cf35e200bf28b5a500fdeb5ddec201cea73 SHA256 f4446408b8b2a94c7e54bfd5480b2772f645f68956ffb9a639f1dfaca71cbc87
-DIST AdobeReader_deu-8.1.1-1.i486.tar.bz2 50732359 RMD160 ccf680c20ad1990e0200de2029b006b471d743f1 SHA1 22aaadc6ef9f20a592f26f3209281f649328f65b SHA256 520b85a31dc5ee9bfcd3fece151f2cf0f55202fcefe35b2ddf1dbda24ecbb1ad
 DIST AdobeReader_deu-8.1.2-1.i486.tar.bz2 50281025 RMD160 73dd0640270e92bcb333b91e934e76f0e1d5f316 SHA1 cf054a8a348cd117e10cb1478a4bbe49bf438812 SHA256 23ab6e31386be91535ea1778f1ac4b9eb388a01a1ee06a2ae7ab8abc8bb8438a
-DIST AdobeReader_enu-7.0.9-1.i386.tar.gz 44165526 RMD160 b9d7b2068be3314054581ff129d6cb5fee7677f6 SHA1 793cc8bcf59a6c24b6e74881bad978efcd447df9 SHA256 1e161174d932788c17e784a626ec02eec79158ecd813e206117356f54ed94863
-DIST AdobeReader_enu-8.1.1-1.i486.tar.bz2 47378597 RMD160 5dcc576556fa11b0e122080216b9ccd8718201e4 SHA1 893cf6af564ff20b5c730fc590009ab6da62c5f4 SHA256 472a15b731c02d9a18c3a4391249b4a1543be6788967efb4b8262821b4286a06
 DIST AdobeReader_enu-8.1.2-1.i486.tar.bz2 47021920 RMD160 92166c4ca3af8faa24b19c381d57cc53970f5050 SHA1 b9d087805d8be93556f8d5518f30a140517d03ed SHA256 46a4af0a2f617fbe713afe243f9add0a65ae44bf3b4196887702f1e0b7b8c08b
-DIST AdobeReader_esp-7.0.9-1.i386.tar.gz 48236413 RMD160 acbc255aade77f35db69a942787e287318be13f1 SHA1 fd48713078bfd1226dfab0c0a8f863cea3f6d4b3 SHA256 fe18aea3831696badedd3f7cf505acfce154d4180afc65ee6191f4e5231439c4
-DIST AdobeReader_esp-8.1.1-1.i486.tar.bz2 49986587 RMD160 88bc5fe53cfff4e4c98d240adf1d45df28b05d67 SHA1 f832959c6e470a504e39d1bd68dcdcb684dd48d4 SHA256 8920f2fae0d0b7b84700315ecbdd45e48ddae273c107673badce4a55a364816f
 DIST AdobeReader_esp-8.1.2-1.i486.tar.bz2 49577796 RMD160 0c8f5261a02cbe02a3797d6baca02c790875a2bf SHA1 5039c99ebdc9ddfd3cd75970f259c6b20fccf893 SHA256 c52508b38dddf34f291393d9f18335f26fc9869637575f6ac2027168885600c7
-DIST AdobeReader_fra-7.0.9-1.i386.tar.gz 48516382 RMD160 7c61343f03b2a466fc385834f6981eb64d4cb023 SHA1 2146a9893a47362f9e0afe46aa766b4b6dc6401e SHA256 97d1fd53ba34953f398aed9d1fc648de0cfa0fd728f29b0f5d3244c0f17b4581
-DIST AdobeReader_fra-8.1.1-1.i486.tar.bz2 50140033 RMD160 22a5e41dcf5353926a37ecea7c527b567d3b9408 SHA1 a29b3372a024be7a6ce47c4b84ed1947ec6f19d8 SHA256 5265e371855cab4305468de69570a0f9007160116a782bae4883520caee4a043
 DIST AdobeReader_fra-8.1.2-1.i486.tar.bz2 49809619 RMD160 0627e0ddba5c0a3a41f83c1f714ef8b32e217849 SHA1 7687df3bb3f64a476f8ae211e660eacb121a8b82 SHA256 e1dc01f498cd313063e9fcb5a753b70cb3758a996a5142c730ef21e0f8bce72e
-DIST AdobeReader_ita-7.0.9-1.i386.tar.gz 48035548 RMD160 6e43fa6c02c778e844c6e26586d4707d3f9ab17a SHA1 d180e3561fe518c7df7b46e6b3bb51e19e5c6859 SHA256 f591c20760aa17615707d2f8e079986f95d446ee65da5655129329e741e315cd
-DIST AdobeReader_ita-8.1.1-1.i486.tar.bz2 49908208 RMD160 fc3d28fd966e7655fe451be204a123836c47b3ef SHA1 024dc040e1a6014f21e21095c26a0ff59ee8ceb5 SHA256 f8e15cb053964dd0d135c4b17c8b3852a6e24ebc078fcf304b338ddefffa3d31
 DIST AdobeReader_ita-8.1.2-1.i486.tar.bz2 49464145 RMD160 0f371720f08088926848817672af4215b0a85313 SHA1 648faf85dd6e83ba92ac898e0668eaf7595da758 SHA256 e6501bbd415fc7dbad30aae61fb70c75de2dcc084d30f1ff126bd8ea78524d01
-DIST AdobeReader_jpn-7.0.9-1.i386.tar.gz 57921998 RMD160 b3c02a96f5ec0cbb32e65249101107e8e8ef4b89 SHA1 843c70dc64b4dff24eba5cab30db66f38a317425 SHA256 519f65a4af242fedbe4e0d7b58a9eeaf7d8abd217ab4276c0caa763cf257faa9
-DIST AdobeReader_jpn-8.1.1-1.i486.tar.bz2 53596371 RMD160 ee4dc6c53be87d78029bad55332f601d94e5b777 SHA1 20dd90516536196fd77843d2cdbc77bc7b0fb9c0 SHA256 eb59c7ae54b5f186329a0907e6a45d87f572e561f891d783a0aeeed746410d86
 DIST AdobeReader_jpn-8.1.2-1.i486.tar.bz2 57748148 RMD160 a1646ed3e0b0b733a7fbf8aa73e166ac86d871bd SHA1 d90864e11595fcd0272db2881998e7953f4e2939 SHA256 d082d4548204963c031266629879abc372a9f2693655cbc3cb3bd8bfef2e4c5b
-DIST AdobeReader_kor-7.0.9-1.i386.tar.gz 52817384 RMD160 68e73c8effe033024a0d6054b0ceb4960c773914 SHA1 07695dbbd584f7f023d05fb0fed35060fafc54c7 SHA256 ed8f5523b24759f4977f7cfe825d01201a83cb5210d62abf03a570e62df9e4ab
-DIST AdobeReader_kor-8.1.1-1.i486.tar.bz2 51312285 RMD160 5190d359c89cbb1d3d0a2f75594005543a260404 SHA1 70f76273a2053ac6b747e32cb78e5aaab70617e9 SHA256 9f19d98dc0dfc327c272ac762612c0105c84a88908a15651daafb1f06c0519cb
 DIST AdobeReader_kor-8.1.2-1.i486.tar.bz2 50964893 RMD160 3932d0cd46fc74121304c6282b6314216c9fc8db SHA1 966c2b3f39c5241cfe0a05c197d8d9454dbb9f3b SHA256 46dc86e32b5a2c08d8e44feab860bd422ed99d9f58ec54acd9dc3bb17777b0c3
-DIST AdobeReader_nld-7.0.9-1.i386.tar.gz 48354998 RMD160 32fd83acff5e89ef4a5d59b45fbacb3eb885e884 SHA1 e2cc4efa89a59428207a36e99e05265a6ebbc24f SHA256 2704879d5a40a06eb2260018ae9ef7f5e54f6f78ca93f26f18ec78bda6aef95d
-DIST AdobeReader_nld-8.1.1-1.i486.tar.bz2 50132817 RMD160 9aebd0f9a36d335ed8fb079d2770d6861ebdb3f4 SHA1 87edb45d531cca1133670f657af61dd23bdbaca0 SHA256 ddf7b26d5b081721ee43914baacef2486d055fc89c3fc070808b9d864e44dd01
 DIST AdobeReader_nld-8.1.2-1.i486.tar.bz2 49779989 RMD160 f55507c512943538ae5c1ba003574879483e42d6 SHA1 fdd7090a5f9da3c08ca48597c7c6d458b9fed558 SHA256 a0966e461dc4fada807b9044a6af3669e46db1cef3b13dbd09e207a347b0e56a
-DIST AdobeReader_nor-7.0.9-1.i386.tar.gz 48349118 RMD160 24b820519261a23f742b8a3ffc80d3c80775bdce SHA1 777264427d3c1e8e4dfd40654537b1a1e0c8eac1 SHA256 f111e0b180c47c7f7072bc1009394ea75bc2d01bb2abbe50a103aabc92401d23
-DIST AdobeReader_nor-8.1.1-1.i486.tar.bz2 50156539 RMD160 82dd89d0d9d9e793194056e6fbf25a6e8a7e615f SHA1 26af096ba2094b070436fc4a18c73595456ed852 SHA256 2d92095290d3c5218474f84b6bc9c2da48a62380fa7a868c8a4290431eb95451
 DIST AdobeReader_nor-8.1.2-1.i486.tar.bz2 49764920 RMD160 d7be0259aed57c1e79fc224a2872c99142a5716b SHA1 bd30ca3c9e3beb04373f1cf6487a8f003a1561c5 SHA256 125132c23892bed59e0cd00ebd72296c7d118a6d2560fca3c8445d492cc8ae13
-DIST AdobeReader_ptb-7.0.9-1.i386.tar.gz 48194861 RMD160 3784ef2a4d08a9b63337ab39b5e45ec5c08686af SHA1 60d51dda92097aabc634f1e349cce93d3732be2b SHA256 4e78333bc6a3af013bbb5d59721afee4c4a0462f1bdcb1a1a54e7c2cbe79541b
-DIST AdobeReader_ptb-8.1.1-1.i486.tar.bz2 49939757 RMD160 278d9c973ad772f0f00149bdd4d2ccdd96cbba58 SHA1 455f62cbd83ccd37fbef581c66593073fe920902 SHA256 4a1225378ec778b393b433f61eaefe044a366ae16796a818a4ef94a090a24f80
 DIST AdobeReader_ptb-8.1.2-1.i486.tar.bz2 49580745 RMD160 e216d286f8dfa6a7df9e1917fedf1bebb7fc90b3 SHA1 8d1417c92d164206fb68f0d26a7d8f9c338b315d SHA256 367dd222867ee9614bb3fbcdab7d67391d0f51e8f3b0ed78d1f0bae7c544953a
-DIST AdobeReader_suo-7.0.9-1.i386.tar.gz 48256107 RMD160 77c47af7d67fd4a8f17c419088658664872cf10e SHA1 7f628a7f91ec7569f9c56d48e65283f2974cdee9 SHA256 523d07091fe29b37eb21f314ee513a258c5b6a5b039caab30dab5ffc53829977
-DIST AdobeReader_suo-8.1.1-1.i486.tar.bz2 50040185 RMD160 1802d5d61e621e8aba5ba223ed87051e2aab8142 SHA1 cb353cb253976b195a6342c953838a87f96f4d31 SHA256 2e2c6ffd7ca18215727979c8f9c45a3426e6fe915752c5fe519bd2afa70ba6f9
 DIST AdobeReader_suo-8.1.2-1.i486.tar.bz2 49687266 RMD160 9ddccf8a3ce0356e3a30991afb1634417a69c96b SHA1 be092726845f12561736117baf68c04853ebc585 SHA256 10e1819e7dfb03300c926cf3e612b94af56ecd9b20f90a28239af593c3ef3daf
-DIST AdobeReader_sve-7.0.9-1.i386.tar.gz 49194849 RMD160 a93add1f6fb9e54272da283c848ef61d7b953baa SHA1 a494b65e2f7b2916ef346a13d8825c5b32b24239 SHA256 8b09ab347ab4b307b70ea44f0dfe3c3a2e19cfeafe936e43fe8f042464b50c26
-DIST AdobeReader_sve-8.1.1-1.i486.tar.bz2 50905675 RMD160 76c0b620154fabe4e791c50a515e975ffb335c39 SHA1 8a948e135a4168c7932810f2f67211f89577f4ad SHA256 9b40945f04c4422752df53bb284969c775984755dfc78a415be4d9c47fbad31e
 DIST AdobeReader_sve-8.1.2-1.i486.tar.bz2 50509188 RMD160 5e22c7d066b4f07294cf33bbd68386c399d18332 SHA1 890ac2d50fabebd9317c9db9047471167f74bdd7 SHA256 f0657939f54f3aacd4fba2a7b60e6be19c110b77e1a1714f263086008e95ef21
 DIST libcups.so-i386.bz2 50564 RMD160 a8bedc7151eb1d547616124bfdd4844699a33c15 SHA1 d55609b2889c0cb668fb73b59d9d0ea4b3094a47 SHA256 77eb5cd6aeab630812f7e911db04b6042cd6dee6aa7b9d8cf7756dca14e24b38
-EBUILD acroread-7.0.9-r1.ebuild 7411 RMD160 cf060f9dc9f8fcc5cbef8599b757e83e15044d33 SHA1 95b1e22b8300d3f0489e272a853487c5f5851be0 SHA256 ebc49c06f506ffbeebb4b1c198dc2dccc6f9643df3946e31d26921e8f227bd29
-EBUILD acroread-8.1.1-r1.ebuild 8557 RMD160 a6c0ee3254c85a05ff648e324ea8f51f72f70d14 SHA1 8bae3e799662a0e3f824e05a292b433d839dc5bf SHA256 594bf717331d8f153125f32d4de6b491e915ca92a984985ef21b14a546877124
-EBUILD acroread-8.1.1-r2.ebuild 8641 RMD160 46ea39033b153a99a46492985ab2dfd2b6e509fe SHA1 0003cae0552c23c92d5cae5fab17506b4939f625 SHA256 fc11a06e5a13c8218e55d9c868203928e11d124749e6e50af2087d405189d288
+EBUILD acroread-8.1.2-r1.ebuild 8840 RMD160 7e1460d183993344976993633e94758485c7d5fd SHA1 cf4a96c421d1071bafc69db8d11116a2b8679476 SHA256 14d1ca861a4030cddfefd125a8013a9d472c1a6dd3d668b07200686ac42f2a3f
 EBUILD acroread-8.1.2.ebuild 8630 RMD160 93d626bebca82ab4e2216d618c3abd06699cb13d SHA1 3610cb41ad9c71f2a05c67725ef858a9ef3fdebc SHA256 f271a85d0fd0dbc29fb9eb83e8dd9ace2eac5786cee762dc5ac90724f4d1d7df
-MISC ChangeLog 19176 RMD160 b318fa4a3bb27101b03727ff5a402293b46031b5 SHA1 34c5473d8909f71ff8a6a2762547853ea3edbfa6 SHA256 6a825ff3563ffaf20bc8e6095f8f4f2cbd5d5b297f430177e6e102b2e1d4bd82
+MISC ChangeLog 19606 RMD160 ef976dfc1a2dbdcf9985cb6ea1c4036045482565 SHA1 2d544e83fd712e7abeadefaeae4c9071dd7a417d SHA256 0b9258d71871cb04d1db34ec4755f0ac71347332dbd0aa814a60bd9aa8ad7073
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/acroread/acroread-7.0.9-r1.ebuild b/app-text/acroread/acroread-7.0.9-r1.ebuild
deleted file mode 100644 (file)
index 4e2ebf5..0000000
+++ /dev/null
@@ -1,228 +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/acroread/acroread-7.0.9-r1.ebuild,v 1.6 2007/04/07 14:48:46 genstef Exp $
-
-inherit eutils nsplugins
-
-DESCRIPTION="Adobe's PDF reader"
-HOMEPAGE="http://www.adobe.com/products/acrobat/"
-IUSE="cups ldap nsplugin"
-
-SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/7x/${PV}"
-SRC_FOOT="-${PV}-1.i386.tar.gz"
-
-LINGUA_LIST="en:enu de:deu fr:fra sv:sve es:esp pt:ptb nb:nor it:ita fi:suo nl:nld da:dan ja:jpn ko:kor zh_CN:chs zh_TW:cht"
-SRC_URI=
-DEFAULT_URI="${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT}"
-for ll in ${LINGUA_LIST}; do
-       iuse_l="linguas_${ll/:*}"
-       src_l=${ll/*:}
-       IUSE="${IUSE} ${iuse_l}"
-       DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )"
-       SRC_URI="${SRC_URI}
-               ${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdobeReader_${src_l}${SRC_FOOT} )"
-done
-SRC_URI="${SRC_URI}
-       ${DEFAULT_URI}
-       x86? ( !cups? ( mirror://gentoo/libcups.so-i386.bz2 ) )"
-
-LICENSE="Adobe"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip mirror"
-
-RDEPEND="x86? ( >=x11-libs/gtk+-2.0
-                       cups? ( net-print/cups )
-                       ldap? ( net-nds/openldap ) )
-       amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2
-                       >=app-emulation/emul-linux-x86-gtklibs-2.0 )"
-QA_TEXTRELS="opt/Acrobat7/Reader/intellinux/lib/libCoolType.so.5.01
-       opt/Acrobat7/Reader/intellinux/lib/libcrypto.so.0.9.6
-       opt/Acrobat7/Reader/intellinux/lib/libJP2K.so
-       opt/Acrobat7/Reader/intellinux/lib/libAXSLE.so
-       opt/Acrobat7/Reader/intellinux/lib/librt3d.so
-       opt/Acrobat7/Reader/intellinux/SPPlugins/ADMPlugin.apl
-       opt/Acrobat7/Reader/intellinux/plug_ins3d/tesselate.x3d
-       opt/Acrobat7/Reader/intellinux/plug_ins3d/drvSOFT.x3d
-       opt/Acrobat7/Reader/intellinux/plug_ins3d/3difr.x3d
-       opt/Acrobat7/Reader/intellinux/plug_ins3d/drvOpenGL.x3d
-       opt/Acrobat7/Reader/intellinux/plug_ins3d/2d.x3d
-       opt/Acrobat7/Reader/intellinux/plug_ins/checkers.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/EFS.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/MakeAccessible.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/DigSig.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/wwwlink.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/SaveAsRTF.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/PPKLite.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/ewh.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/PDDom.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/SOAP.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/SendMail.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/Annots.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/SearchFind.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/Spelling.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/Accessibility.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/EScript.api
-       opt/Acrobat7/Reader/intellinux/plug_ins/AcroForm.api
-       opt/netscape/plugins/nppdf.so
-       opt/Acrobat7/Reader/intellinux/sidecars/RdLang32*"
-
-INSTALLDIR=/opt/Acrobat7
-
-S=${WORKDIR}/AdobeReader
-
-pkg_setup() {
-       # x86 binary package, ABI=x86
-       # Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
-       has_multilib_profile && ABI="x86"
-}
-
-# Determine lingua from filename
-acroread_get_ll() {
-       local f_src_l ll lingua src_l
-       f_src_l=${1/${SRC_FOOT}}
-       f_src_l=${f_src_l/*_}
-       for ll in ${LINGUA_LIST}; do
-               lingua=${ll/:*}
-               src_l=${ll/*:}
-               if [[ ${src_l} == ${f_src_l} ]]; then
-                       echo ${lingua}
-                       return
-               fi
-       done
-       die "Failed to match file $1 to a LINGUA; please report"
-}
-
-src_unpack() {
-       local ll linguas fl
-       # Unpack all into the same place; overwrite common files.
-       fl=""
-       for pkg in ${A}; do
-               cd ${WORKDIR}
-               unpack ${pkg}
-               cd ${S}
-               # Note; bash-3.2_p9 doesn't like quotes on the rhs of =~
-               # Seems inconsistent to me; this works for now, awaiting
-               # upstream response.
-               if [[ ${pkg} =~ ^AdobeReader_ ]]; then
-                       tar xf ILINXR.TAR ||
-                               die "Failed to unpack ILINXR.TAR; is distfile corrupt?"
-                       tar xf COMMON.TAR ||
-                               die "Failed to unpack COMMON.TAR; is distfile corrupt?"
-                       epatch ${FILESDIR}/acroread-scim.patch
-                       epatch ${FILESDIR}/acroread-low-startup-fontissue.patch
-                       epatch ${FILESDIR}/acroread-expr.patch
-                       ll=$(acroread_get_ll ${pkg})
-                       mv bin/acroread bin/acroread.${ll}
-                       if [[ -z ${fl} ]]; then
-                               fl=${ll}
-                               linguas="${ll}"
-                       else
-                               linguas="${linguas} ${ll}"
-                       fi
-               fi
-       done
-       if [[ ${linguas} == ${fl} ]]; then
-               # Only one lingua selected - skip building the wrapper
-               mv bin/acroread.${fl} bin/acroread ||
-                       die "Failed to put acroread.${fl} back to acroread; please report"
-       else
-               # Build wrapper.  Launch the acroread for the environment variable
-               # LANG (matched with a trailing * so that for example 'de_DE' matches
-               # 'de', 'en_GB' matches 'en' etc).
-               cat > bin/acroread <<-EOF
-                       #!/bin/bash
-                       # Copyright 1999-2007 Gentoo Foundation
-                       # Distributed under the terms of the GNU General Public License v2
-                       #
-                       # Automatically generated by ${CATEGORY}/${PF}
-
-                       # Exec the acroread script for the language chosen in
-                       # LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc)
-                       L=\${LC_ALL}
-                       L=\${L:-\${LC_MESSAGES}}
-                       L=\${L:-\${LANG}}
-                       case \${L} in
-               EOF
-               for ll in ${linguas}; do
-                       echo "${ll}*) exec ${INSTALLDIR}/acroread.${ll} \"\$@\";;" >> bin/acroread
-               done
-               # default to English (in particualr for LANG=C)
-               cat >> bin/acroread <<-EOF
-                       *) exec ${INSTALLDIR}/acroread.${fl} "\$@";;
-                       esac
-               EOF
-               chmod 755 bin/acroread
-       fi
-}
-
-src_install() {
-       local i
-
-       cp Resource/Support/AdobeReader_KDE.desktop AdobeReader.desktop
-       domenu AdobeReader.desktop
-       doicon Resource/Icons/AdobeReader.png
-
-       dodir ${INSTALLDIR}
-       DIRS="Reader Resource"
-       for i in ${DIRS}
-       do
-               if [ -d ${i} ] ; then
-                       chown -R --dereference -L root:0 ${i}
-                       mv ${i} ${D}${INSTALLDIR}
-               fi
-       done
-
-       exeinto ${INSTALLDIR}
-       for exe in bin/acroread*; do
-               doexe ${exe} || die "doexe failed"
-       done
-       # The Browser_Plugin_HowTo.txt is now in a subdirectory, which
-       # is named according to the language the user is using.
-       # Ie. for German, it is in a DEU directory.     See bug #118015
-       #dodoc Browser/${LANG_TAG}/Browser_Plugin_HowTo.txt
-       dodoc Browser/HowTo/*/Browser_Plugin_HowTo.txt
-
-       if use nsplugin ; then
-               exeinto /opt/netscape/plugins
-               doexe Browser/intellinux/nppdf.so
-               inst_plugin /opt/netscape/plugins/nppdf.so
-       fi
-
-       if ! use ldap ; then
-               rm ${D}${INSTALLDIR}/Reader/intellinux/plug_ins/PPKLite.api
-       fi
-
-       # libcups is needed for printing support (bug 118417)
-       if use x86 && ! use cups ; then
-               mv ${WORKDIR}/libcups.so-i386 ${WORKDIR}/libcups.so.2
-               exeinto ${INSTALLDIR}/Reader/intellinux/lib
-               doexe ${WORKDIR}/libcups.so.2
-               dosym libcups.so.2 ${INSTALLDIR}/Reader/intellinux/lib/libcups.so
-       fi
-
-       dodir /opt/bin
-       dosym ${INSTALLDIR}/acroread /opt/bin/acroread
-
-       # fix wrong directory permissions (bug #25931)
-       find ${D}${INSTALLDIR}/. -type d | xargs chmod 755 || die
-}
-
-pkg_postinst () {
-       local ll lc
-       use ldap ||
-               elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
-       use nsplugin ||
-               elog "The Acrobat(TM) Browser Plugin can be enabled with USE=nsplugin"
-       lc=0
-       for ll in ${LINGUA_LIST}; do
-               use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
-       done
-       if [[ ${lc} > 1 ]]; then
-               elog "Multiple languages have been installed, selected via a wrapper script."
-               elog "The language is selected according to the LANG environment variable"
-               elog "(defaulting to English if LANG is not set, or no matching language"
-               elog "version is installed).  Users may need to remove their preferences in"
-               elog "~/.adobe to switch languages."
-       fi
-}
diff --git a/app-text/acroread/acroread-8.1.1-r1.ebuild b/app-text/acroread/acroread-8.1.1-r1.ebuild
deleted file mode 100644 (file)
index 946a7e3..0000000
+++ /dev/null
@@ -1,250 +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/acroread/acroread-8.1.1-r1.ebuild,v 1.1 2008/01/18 03:03:19 tgurr Exp $
-
-inherit eutils nsplugins
-
-DESCRIPTION="Adobe's PDF reader"
-HOMEPAGE="http://www.adobe.com/products/acrobat/"
-IUSE="cups ldap nsplugin"
-
-SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}"
-SRC_FOOT="-${PV}-1.i486.tar.bz2"
-
-LINGUA_LIST="da:dan de:deu en:enu es:esp fi:suo fr:fra it:ita ja:jpn ko:kor nb:nor nl:nld pt:ptb sv:sve zh_CN:chs zh_TW:cht"
-DEFAULT_URI="${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT}"
-for ll in ${LINGUA_LIST}; do
-       iuse_l="linguas_${ll/:*}"
-       src_l=${ll/*:}
-       IUSE="${IUSE} ${iuse_l}"
-       DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )"
-       SRC_URI="${SRC_URI}
-               ${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdobeReader_${src_l}${SRC_FOOT} )"
-done
-SRC_URI="${SRC_URI}
-       ${DEFAULT_URI}
-       x86? ( !cups? ( mirror://gentoo/libcups.so-i386.bz2 ) )"
-
-LICENSE="Adobe"
-SLOT="0"
-# NOTE - Do not go stable until all language variants are released for this version
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip mirror"
-
-# Needs libgtkembedmoz.so, which can come from xulrunner or mozilla-firefox.
-# In the case of mozilla-firefox, need to create /etc/gre.d/gre.conf with
-# GRE_PATH set to the /usr/lib/mozilla-firefox
-# TODO: sort out libgtkembedmoz.so for amd64.
-RDEPEND="x86? ( >=x11-libs/gtk+-2.0
-                       cups? ( net-print/cups )
-                       ldap? ( net-nds/openldap )
-                       || ( net-libs/xulrunner
-                               www-client/mozilla-firefox ) )
-       amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2
-                       >=app-emulation/emul-linux-x86-gtklibs-2.0 )"
-QA_TEXTRELS="opt/Acrobat8/Reader/intellinux/plug_ins/PPKLite.api
-       opt/Adobe/Reader8/Browser/intellinux/nppdf.so
-       opt/netscape/plugins/nppdf.so"
-QA_EXECSTACK="opt/Adobe/Reader8/Reader/intellinux/plug_ins/Annots.api
-       opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
-       opt/Adobe/Reader8/Reader/intellinux/bin/acroread
-       opt/Adobe/Reader8/Reader/intellinux/bin/SynchronizerApp-binary
-       opt/Adobe/Reader8/Reader/intellinux/lib/libsccore.so
-       opt/Adobe/Reader8/Reader/intellinux/lib/libcrypto.so.0.9.7"
-
-INSTALLDIR=/opt
-
-S="${WORKDIR}/AdobeReader"
-
-# Actually, ahv segfaults when run standalone so presumably
-# it isn't intended for direct use - so the only launcher is
-# acroread after all.
-LAUNCHERS="Adobe/Reader8/bin/acroread"
-#      Adobe/HelpViewer/1.0/intellinux/bin/ahv"
-
-pkg_setup() {
-       # x86 binary package, ABI=x86
-       # Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
-       has_multilib_profile && ABI="x86"
-}
-
-# Determine lingua from filename
-acroread_get_ll() {
-       local f_src_l ll lingua src_l
-       f_src_l=${1/${SRC_FOOT}}
-       f_src_l=${f_src_l/*_}
-       for ll in ${LINGUA_LIST}; do
-               lingua=${ll/:*}
-               src_l=${ll/*:}
-               if [[ ${src_l} == ${f_src_l} ]]; then
-                       echo ${lingua}
-                       return
-               fi
-       done
-       die "Failed to match file $1 to a LINGUA; please report"
-}
-
-src_unpack() {
-       local ll linguas fl launcher
-       # Unpack all into the same place; overwrite common files.
-       fl=""
-       for pkg in ${A}; do
-               cd "${WORKDIR}"
-               unpack ${pkg}
-               cd "${S}"
-               if [[ ${pkg} =~ ^AdobeReader_ ]]; then
-                       tar xf ILINXR.TAR ||
-                               die "Failed to unpack ILINXR.TAR; is distfile corrupt?"
-                       tar xf COMMON.TAR ||
-                               die "Failed to unpack COMMON.TAR; is distfile corrupt?"
-                       # Don't know if this is still necessary or not...
-                       #epatch ${FILESDIR}/acroread-scim.patch
-                       # Don't know if this is still necessary or not...
-                       #epatch ${FILESDIR}/acroread-low-startup-fontissue.patch
-                       # Old under-quoted expr functions no longer appear
-                       #epatch ${FILESDIR}/acroread-expr.patch
-                       ll=$(acroread_get_ll ${pkg})
-                       for launcher in ${LAUNCHERS}; do
-                               mv ${launcher} ${launcher}.${ll}
-                       done
-                       if [[ -z ${fl} ]]; then
-                               fl=${ll}
-                               linguas="${ll}"
-                       else
-                               linguas="${linguas} ${ll}"
-                       fi
-               fi
-       done
-       if [[ ${linguas} == ${fl} ]]; then
-               # Only one lingua selected - skip building the wrappers
-               for launcher in ${LAUNCHERS}; do
-                       mv ${launcher}.${fl} ${launcher} ||
-                               die "Failed to put ${launcher}.${fl} back to ${launcher}; please report"
-               done
-       else
-               # Build wrappers.  Launch the acroread for the environment variable
-               # LANG (matched with a trailing * so that for example 'de_DE' matches
-               # 'de', 'en_GB' matches 'en' etc).
-               #
-               # This is a bit premature at the moment on 8.1.1, for two reasons:
-               # 1) The only language issued so far by Adobe is English, and the
-               #    provided launcher doesn't bring out its strings separately
-               #    (indicating internationalisation hasn't yet begin for 8.1.1)
-               # 2) HelpViewer is new - I don't know if Adobe are likely to
-               #    internationalise it or not.
-               for launcher in ${LAUNCHERS}; do
-                       cat > ${launcher} <<-EOF
-                               #!/bin/bash
-                               # Copyright 1999-2007 Gentoo Foundation
-                               # Distributed under the terms of the GNU General Public License v2
-                               #
-                               # Automatically generated by ${CATEGORY}/${PF}
-
-                               # Exec the acroread script for the language chosen in
-                               # LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc)
-                               L=\${LC_ALL}
-                               L=\${L:-\${LC_MESSAGES}}
-                               L=\${L:-\${LANG}}
-                               case \${L} in
-                       EOF
-                       for ll in ${linguas}; do
-                               echo "${ll}*) exec ${INSTALLDIR}/${launcher}.${ll} \"\$@\";;" >> ${launcher}
-                       done
-                       # default to English (in particualr for LANG=C)
-                       cat >> ${launcher} <<-EOF
-                               *) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
-                               esac
-                       EOF
-                       chmod 755 ${launcher}
-               done
-       fi
-}
-
-src_install() {
-       local dir
-
-       # Install desktop files
-       domenu Adobe/Reader8/Resource/Support
-       # Install Icons - choose 48x48 since that's what the previous versions
-       # supplied.
-       doicon Adobe/Reader8/Resource/Icons/48x48
-
-       dodir /opt
-       chown -R --dereference -L root:0 Adobe
-       cp -dpR Adobe "${D}"opt/
-
-       # The Browser_Plugin_HowTo.txt is now in a subdirectory, which
-       # is named according to the language the user is using.
-       # Ie. for German, it is in a DEU directory.     See bug #118015
-       #dodoc Browser/${LANG_TAG}/Browser_Plugin_HowTo.txt
-       dodoc Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt
-
-       if use nsplugin ; then
-               exeinto /opt/netscape/plugins
-               doexe Adobe/Reader8/Browser/intellinux/nppdf.so
-               inst_plugin /opt/netscape/plugins/nppdf.so
-       fi
-
-       if ! use ldap ; then
-               rm "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
-       fi
-
-       # libcups is needed for printing support (bug 118417)
-       if use x86 && ! use cups ; then
-               mv "${WORKDIR}"/libcups.so-i386 "${WORKDIR}"/libcups.so.2
-               exeinto ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib
-               doexe "${WORKDIR}"/libcups.so.2
-               dosym libcups.so.2 ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib/libcups.so
-       fi
-
-       dodir /opt/bin
-       for launcher in ${LAUNCHERS}; do
-               dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
-       done
-
-#      # fix wrong directory permissions (bug #25931)
-#      find ${D}${INSTALLDIR}/. -type d | xargs chmod 755 || die
-}
-
-pkg_postinst () {
-       local ll lc
-       grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-       if [[ $? != "0" ]]; then
-               for lib in /usr/lib/mozilla-firefox; do
-                       if [[ -f ${lib}/libgtkembedmoz.so ]]; then
-                               mkdir -p /etc/gre.d
-                               cat > /etc/gre.d/gre.conf <<-EOF
-                                       GRE_PATH=${lib}
-                               EOF
-                               elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found"
-                               elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf"
-                               break # don't search any more libraries
-                       fi
-               done
-       fi
-       use ldap ||
-               elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
-       use nsplugin ||
-               elog "The Acrobat(TM) Browser Plugin can be enabled with USE=nsplugin"
-       lc=0
-       for ll in ${LINGUA_LIST}; do
-               use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
-       done
-       if [[ ${lc} > 1 ]]; then
-               elog "Multiple languages have been installed, selected via a wrapper script."
-               elog "The language is selected according to the LANG environment variable"
-               elog "(defaulting to English if LANG is not set, or no matching language"
-               elog "version is installed).  Users may need to remove their preferences in"
-               elog "~/.adobe to switch languages."
-       fi
-       grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-       if [[ $? != "0" ]]; then
-               ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which should"
-               ewarn "come with Mozilla Firefox or XULRunner, however it couldn't be found."
-               ewarn "The first time you start acroread, it will complain about this, telling"
-               ewarn "you to add the path to it to your preferences.  Clear the error dialog,"
-               ewarn "close the Beyond Acrobat Reader dialog, go to Edit -> Preferences -> Internet"
-               ewarn "and set the libgtkembedmoz directory to the place where it exists,"
-               ewarn "then close and restart acroread."
-       fi
-}
similarity index 70%
rename from app-text/acroread/acroread-8.1.1-r2.ebuild
rename to app-text/acroread/acroread-8.1.2-r1.ebuild
index 5bcd4699ba356793da56ab246b62d6bd536e576f..a1c69abfc1050aed6318421f48167efaa9838097 100644 (file)
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1-r2.ebuild,v 1.1 2008/01/30 20:31:13 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.2-r1.ebuild,v 1.1 2008/03/07 20:57:51 tgurr Exp $
 
 inherit eutils nsplugins
 
 DESCRIPTION="Adobe's PDF reader"
 HOMEPAGE="http://www.adobe.com/products/acrobat/"
-IUSE="cups ldap nsplugin"
+IUSE="cups ldap minimal nsplugin"
 
 SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}"
 SRC_FOOT="-${PV}-1.i486.tar.bz2"
@@ -22,8 +22,7 @@ for ll in ${LINGUA_LIST} ; do
                ${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdobeReader_${src_l}${SRC_FOOT} )"
 done
 SRC_URI="${SRC_URI}
-       ${DEFAULT_URI}
-       x86? ( !cups? ( mirror://gentoo/libcups.so-i386.bz2 ) )"
+       ${DEFAULT_URI}"
 
 LICENSE="Adobe"
 SLOT="0"
@@ -34,16 +33,16 @@ RESTRICT="strip mirror"
 # seamonkey. In the case of mozilla-firefox and seamonkey, we need to create
 # /etc/gre.d/gre.conf with GRE_PATH set. On amd64 currently only seamonkey-bin
 # provides a 32bit libgtkembedmoz.so.
-RDEPEND="x86? ( >=x11-libs/gtk+-2.0
-                       cups? ( net-print/cups )
+RDEPEND="cups? ( net-print/cups )
+       x86? ( >=x11-libs/gtk+-2.0
                        ldap? ( net-nds/openldap )
-                       || ( net-libs/xulrunner
-                               www-client/mozilla-firefox
-                               www-client/seamonkey
-                               www-client/seamonkey-bin ) )
+                       !minimal? ( || ( net-libs/xulrunner
+                                               www-client/mozilla-firefox
+                                               www-client/seamonkey
+                                               www-client/seamonkey-bin ) ) )
        amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2
                        >=app-emulation/emul-linux-x86-gtklibs-2.0
-                       >=www-client/seamonkey-bin-1.1.7 )"
+                       !minimal? ( >=www-client/seamonkey-bin-1.1.7 ) )"
 QA_TEXTRELS="opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
        opt/Adobe/Reader8/Browser/intellinux/nppdf.so
        opt/netscape/plugins/nppdf.so"
@@ -154,6 +153,18 @@ src_unpack() {
                        chmod 755 ${launcher}
                done
        fi
+
+       # remove cruft
+       rm "${S}"/Adobe/Reader8/bin/UNINSTALL
+       rm "${S}"/Adobe/Reader8/Resource/Support/vnd.*.desktop
+
+       # fix CVE-2008-0883 the sed way, see bug #212367
+       local binfile
+       for binfile in "${S}"/Adobe/Reader8/bin/* ; do
+       sed -i -e '/MkTemp()/,+17d' \
+               -e 's/MkTemp/mktemp/g' \
+               "${binfile}" || die "sed failed"
+       done
 }
 
 src_install() {
@@ -184,14 +195,6 @@ src_install() {
                rm "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
        fi
 
-       # libcups is needed for printing support (bug 118417)
-       if use x86 && ! use cups ; then
-               mv "${WORKDIR}"/libcups.so-i386 "${WORKDIR}"/libcups.so.2
-               exeinto ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib
-               doexe "${WORKDIR}"/libcups.so.2
-               dosym libcups.so.2 ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib/libcups.so
-       fi
-
        dodir /opt/bin
        for launcher in ${LAUNCHERS} ; do
                dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
@@ -199,42 +202,44 @@ src_install() {
 }
 
 pkg_postinst () {
-       local ll lc
-       grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-       if [[ $? != "0" ]] ; then
-               if use x86 ; then
-                       for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
-                               if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
-                                       mkdir -p /etc/gre.d
-                                       cat > /etc/gre.d/gre.conf <<-EOF
-                                               GRE_PATH=${lib}
-                                       EOF
-                                       elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found"
-                                       elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf"
-                                       break # don't search any more libraries
-                               fi
-                       done
-               fi
-               if use amd64 ; then
-                       for lib in /opt/seamonkey ; do
-                               if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
-                                       mkdir -p /etc/gre.d
-                                       cat > /etc/gre.d/gre.conf <<-EOF
-                                               GRE_PATH=${lib}
-                                       EOF
-                                       elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found"
-                                       elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf"
-                                       break # don't search any more libraries
-                               fi
-                       done
+       if ! use minimal ; then
+               local ll lc
+               grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
+               if [[ $? != "0" ]] ; then
+                       if use x86 ; then
+                               for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
+                                       if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+                                               mkdir -p /etc/gre.d
+                                               cat > /etc/gre.d/gre.conf <<-EOF
+                                                       GRE_PATH=${lib}
+                                               EOF
+                                               elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+                                               elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf."
+                                               break # don't search any more libraries
+                                       fi
+                               done
+                       fi
+                       if use amd64 ; then
+                               for lib in /opt/seamonkey ; do
+                                       if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+                                               mkdir -p /etc/gre.d
+                                               cat > /etc/gre.d/gre.conf <<-EOF
+                                                       GRE_PATH=${lib}
+                                               EOF
+                                               elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+                                               elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf."
+                                               break # don't search any more libraries
+                                       fi
+                               done
+                       fi
                fi
        fi
 
        use ldap ||
-               elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
+               elog "The Adobe Reader security plugin can be enabled with USE=ldap"
 
        use nsplugin ||
-               elog "The Acrobat(TM) Browser Plugin can be enabled with USE=nsplugin"
+               elog "The Adobe Reader browser plugin can be enabled with USE=nsplugin"
 
        lc=0
        for ll in ${LINGUA_LIST} ; do
@@ -248,14 +253,19 @@ pkg_postinst () {
                elog "~/.adobe to switch languages."
        fi
 
-       grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-       if [[ $? != "0" ]] ; then
-               ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which should"
-               ewarn "come with Mozilla Firefox, XULRunner or Seamonkey, however it couldn't"
-               ewarn "be found. The first time you start acroread, it will complain about this,"
-               ewarn "telling you to add the path to it to your preferences. Clear the error"
-               ewarn "dialog, close the Beyond Acrobat Reader dialog, go to"
-               ewarn "Edit -> Preferences -> Internet and set the libgtkembedmoz directory to"
-               ewarn "the place where it exists, then close and restart acroread."
+       if ! use minimal ; then
+               grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
+               if [[ $? != "0" ]] ; then
+                       ewarn "Adobe Reader depends dynamically on libgtkembedmoz.so, which should come"
+                       ewarn "with Mozilla Firefox, XULRunner or Seamonkey, however it couldn't be found."
+                       ewarn "The first time you start acroread, it will complain about this, telling you"
+                       ewarn "to add the path to it to your preferences. Clear the error dialog, close the"
+                       ewarn "beyond Adobe Reader dialog, go to Edit -> Preferences -> Internet and set the"
+                       ewarn "libgtkembedmoz directory to the place where it exists, then close and restart"
+                       ewarn "acroread."
+               fi
+       else
+               ewarn "If you want html support and/or view the help you have to re-emerge"
+               ewarn "acroread with USE=\"-minimal\"."
        fi
 }
diff --git a/app-text/acroread/files/acroread-expr.patch b/app-text/acroread/files/acroread-expr.patch
deleted file mode 100644 (file)
index 247cc37..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- Acrobat7.0/bin/acroread.orig       2006-05-21 11:21:23.000000000 +0200
-+++ Acrobat7.0/bin/acroread    2006-05-21 11:30:06.000000000 +0200
-@@ -424,13 +424,13 @@
-             continue
-         fi
- 
--        len_version=`expr length $version`
--        base_version=`expr substr "${base_version}0000000000" 1 $len_version`
--        len_base_version=`expr length $base_version`
-+        len_version=`expr length "$version"`
-+        base_version=`expr substr "${base_version}0000000000" 1 "$len_version"`
-+        len_base_version=`expr length "$base_version"`
- 
-         while [ $len_version -gt $len_base_version ]; do
--            base_version=`expr substr "${base_version}0000000000" 1 $len_version`
--            len_base_version=`expr length $base_version`
-+            base_version=`expr substr "${base_version}0000000000" 1 "$len_version"`
-+            len_base_version=`expr length "$base_version"`
-         done
- 
-       if [ $version -ge $base_version ]; then
diff --git a/app-text/acroread/files/acroread-low-startup-fontissue.patch b/app-text/acroread/files/acroread-low-startup-fontissue.patch
deleted file mode 100644 (file)
index 0ee7909..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch was diffed by me, thanks to ferdy, jokey
-and some others for their IRC-Help.
-
-
---- Acrobat7.0/bin/acroread    2005-05-18 09:05:35.000000000 +0200
-+++ Acrobat7.0/bin/acroread    2005-05-18 09:06:29.000000000 +0200
-@@ -1,6 +1,8 @@
- #!/bin/sh
- #
- 
-+FC=~/.adobe/Acrobat/7.0/Cache/UnixFnt07.lst
-+[ -s ${FC} ] && rm ${FC} && touch ${FC}
- 
- setLangDEU()
- {
diff --git a/app-text/acroread/files/acroread-scim.patch b/app-text/acroread/files/acroread-scim.patch
deleted file mode 100644 (file)
index 518d7b3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch was taken from http://bugs.gentoo.org/show_bug.cgi?id=89766#c6
-
-It fixes startup with scim thanks to Clement Siuchung Cheung <sccheung@umich.edu>
-
---- Acrobat7.0/bin/acroread    2005-05-18 09:05:35.000000000 +0200
-+++ Acrobat7.0/bin/acroread    2005-05-18 09:06:29.000000000 +0200
-@@ -255,6 +255,11 @@
-       fi
- fi
- 
-+if [ "$GTK_IM_MODULE" = "scim" ]; then
-+      GTK_IM_MODULE=xim
-+      export GTK_IM_MODULE
-+fi
-+
- if [ "$1" = "-DEBUG" ] ; then
-   if [ $# = 1 ] ; then
-     export ACRO_EXEC_CMD