Version bump wrt security bug #259992. Also incorporates suggestion from bug #253059, thanks to Keith Gable. Remove old.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 324 insertions, 58 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index fcc7faff0cb5..7065660c9760 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,14 @@
 # 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.122 2008/11/08 13:36:42 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.123 2009/04/06 22:25:41 tgurr Exp $
+
+*acroread-9.1.0 (06 Apr 2009)
+*acroread-8.1.4 (06 Apr 2009)
+
+  06 Apr 2009; Timo Gurr <tgurr@gentoo.org> -acroread-8.1.2-r3.ebuild,
+  +acroread-8.1.4.ebuild, +acroread-9.1.0.ebuild:
+  Version bump wrt security bug #259992. Also incorporates suggestion from
+  bug #253059, thanks to Keith Gable. Remove old.
 
   08 Nov 2008; Markus Meier <maekke@gentoo.org> acroread-8.1.3.ebuild:
   x86 stable, bug #225483
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 6cc5b9636cd2..0bc992059de4 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,45 +1,40 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gentoo_config 356 RMD160 fde2e1f78d39d39611ea91fc94f8c31bc8634425 SHA1 ce38b7160e842d970804216e156d5edbcbfd3e1d SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f
-DIST AdobeReader_chs-8.1.2_SU1-1.i486.tar.bz2 58108832 RMD160 770bfb6b75f3f7a5d4bafb8544c8013bc220bd79 SHA1 24c891daa8e2e237649957ebce2372135ecbfe63 SHA256 fdaf33c4640acf1c8c1fc17ce729095da981abf2bd1dd40716e5ab2acfa2e97f
+DIST AdbeRdr9.1.0-1_i486linux_deu.tar.bz2 65582142 RMD160 3ea46faa96044091b45e1475717951cfb486d8f0 SHA1 b24e99b01c0467264c0e08edb7ad51adec0af997 SHA256 e7425ae941bbbd3180da6651aab2c972cd5a64b32d3cfdb503d5b1cb656920e8
+DIST AdbeRdr9.1.0-1_i486linux_enu.tar.bz2 60093913 RMD160 832a28e9572e55dce5f24568d80356ac990bd3c3 SHA1 f0338abdfe795d7c055d5f9ce034530371a3550e SHA256 c783b6cdb15a30ad9eecd5df950346e9e0eabeac03c155af1b62d5772bb53e52
+DIST AdbeRdr9.1.0-1_i486linux_fra.tar.bz2 64400127 RMD160 7cf972c1261b9d6e0ce87f2fb86feac3803af82b SHA1 1db38bd5bc9add95f935107325739f9917aaf871 SHA256 83f2c902d1c37a4fb912ba3b1857e249b8ab01f18915ab632337ee168d0e4e48
+DIST AdbeRdr9.1.0-1_i486linux_jpn.tar.bz2 68330982 RMD160 5646d5c7ae805f845711d2067b3e70985c056438 SHA1 6858c1e65fff6ed116dc73970c9811f4d42c6c73 SHA256 8759f6b8ada68ab27a50de15136a680494db7cba18e6b77f5a5e0acb81dd09a7
 DIST AdobeReader_chs-8.1.3-1.i486.tar.bz2 58116554 RMD160 b1bf4b1f0a73393c9f80f5f455feac493e93c192 SHA1 f1a8843ad164e4494f2c03ad3605c3ca0b9c5072 SHA256 7259e3e99fc9823ce396471a2029155197e0d76973385e4809a34aedf233c5b7
-DIST AdobeReader_cht-8.1.2_SU1-1.i486.tar.bz2 54010859 RMD160 19adb02ad2a546f0fa7996702c6ccd571dbb583d SHA1 a2f8f0837e6949662adfc741cf7fdb58ea41e382 SHA256 d9b77601c08a3efddee3bf95051df2221cfbd841371c8cffb60819262e20e1c9
+DIST AdobeReader_chs-8.1.4-1.i486.tar.bz2 58147908 RMD160 3957e82fcbb91bc6160eab713377bed69b36168e SHA1 e686ccf5a933d234ce3692285fc58a69888010fe SHA256 cdbd1885b1918ad24ad5bb8a118bb978c843374a424b04273dae52a8f0ad09da
 DIST AdobeReader_cht-8.1.3-1.i486.tar.bz2 54038920 RMD160 017b56f0724d1e87c147c5741a86b5eea8048557 SHA1 3f6399b1772e8a001c117345d456f658c21f2c73 SHA256 0d2939c87bc463b5726267ebe575baf5c41902953c85c8af8005039aac644f22
-DIST AdobeReader_dan-8.1.2_SU1-1.i486.tar.bz2 49574666 RMD160 93aae05d87f11f0c29b943820a70e4cc28d7440a SHA1 a6a2bd2d5f3b4cf554b5a574c75556a4a0871445 SHA256 a287cfd521a6a8a2bbbea1da8b1969293a0ab0eda48b897a01d1c4931becdf64
+DIST AdobeReader_cht-8.1.4-1.i486.tar.bz2 54082943 RMD160 0fbafa9f19c127ed6501212972ba05b50cee3dfa SHA1 016460c8a219e8d68c2cdd248ab3376fe6cf6e70 SHA256 4ae7fb58eb71dba168bb4ddd96970a56dc182d6dbadb2324954584a2896f8b80
 DIST AdobeReader_dan-8.1.3-1.i486.tar.bz2 49621130 RMD160 19b5d8919fd40e25e3acacad7ae6c760333c507f SHA1 1a59a443687dafa09b1351a5a6c2ea91b7b99a26 SHA256 a64a1064afe6cf62af9a1d85e831387c86e3365225c6c780f1a1e42b159299ea
-DIST AdobeReader_deu-8.1.2_SU1-1.i486.tar.bz2 50284194 RMD160 20542734ab7db72db9adbb5849c222325830d60b SHA1 578dc42b0227a47cac281247dc51101618d06ace SHA256 78cc7a79d4f8751963e530bbfb7489f3c44ac0e5c4a2d37485614a2e44a3246a
+DIST AdobeReader_dan-8.1.4-1.i486.tar.bz2 49553888 RMD160 0104ca19cb4e56ef27040bdb619b0973083676ef SHA1 94803f7cb59a75dc22bcf75d0ef92e5f0ab0b46f SHA256 7b2df45efc575f87e8e8379cce17ef45b2e45c028baf2a39098816830f71b8b6
 DIST AdobeReader_deu-8.1.3-1.i486.tar.bz2 50289693 RMD160 9324f31f9388b849bc580b8963bc55a6391f75c1 SHA1 e383036f519d430191f0c908f7818df7593383c8 SHA256 816c7d270a676e84ea9cb220a1ef6bb5d999c4217258c65ebb3cda5d56de90e4
-DIST AdobeReader_enu-8.1.2_SU1-1.i486.tar.bz2 47020212 RMD160 a892ee32d01da4210fb51cf994d508d66ca2750d SHA1 979d07f2ce31eb98d845685cdbfdeebe48643865 SHA256 e62a7dc8cecdc20434ba0fe5de797fcdc2468d5b8726ee8e366fad766a3224bb
+DIST AdobeReader_deu-8.1.4-1.i486.tar.bz2 50288644 RMD160 dc60bc6be628ae8146fab4c424b5d0960498123c SHA1 5bac666f300f7072605345a51991595da12224b1 SHA256 e0f96776feda1b340c57b4fb553d2d1f4378d20c15dba14337b42e7787af9724
 DIST AdobeReader_enu-8.1.3-1.i486.tar.bz2 47013781 RMD160 d5dbaccb84305101081c6c53a3e53754a3a77f34 SHA1 8abbe77246539300e8594603418294c677abfbe6 SHA256 77ae5a11daa3d220d4609cd055d5f937b0228c227a177e5ed338c69892ff032a
-DIST AdobeReader_esp-8.1.2_SU1-1.i486.tar.bz2 49576734 RMD160 228ddd5fd3add22b7b9d44c19ccef15f90b4990e SHA1 40aacf22b5216c09d43bf04bd55e408b85252060 SHA256 5b652acfcfa49f35901e20efbf550201f2940eb741e305d06d71850974015be3
+DIST AdobeReader_enu-8.1.4-1.i486.tar.bz2 47035382 RMD160 c253cbb070a338103070acc9164ae6bfa837ce38 SHA1 c81477edd7427bb451e462cfa1801fc33ee7c514 SHA256 137d63aeecc74cfd1e84d352e6e7f7e4b6563950a9313d46b0bb5fc8c48ab076
 DIST AdobeReader_esp-8.1.3-1.i486.tar.bz2 49588000 RMD160 3b715e5d508af5212f5da0b428173f207e7ac0af SHA1 b98f0945011ddce640ab6424f7f429eb7ebdd0d1 SHA256 a6192c57819d08a5d4ff934615e230777505a4da1cde14510ef5076d0040d0de
-DIST AdobeReader_fra-8.1.2_SU1-1.i486.tar.bz2 49811564 RMD160 d9e0a4d8cff301d71b86c7636d834b1202fed8a5 SHA1 530751878bcbe2e3821dc8d160ca50900ab72c73 SHA256 be0a7bddf7aa1878cec411d25aaf80c52eda3ee1e5cf3ff34bca641f61390161
+DIST AdobeReader_esp-8.1.4-1.i486.tar.bz2 49587160 RMD160 ebec72a98dc11e030664adc2eb9ed82b22ddf3d0 SHA1 806c68c39764a03795f5ad8bc7fe5c22c938c6a0 SHA256 82f4ff3bd93f7e672270b2bf48040fcb789a6459e209bd81fccbbf0636b4001b
 DIST AdobeReader_fra-8.1.3-1.i486.tar.bz2 49822822 RMD160 2e2e32db8aa203e1bc4dd894e7beafb2d4654463 SHA1 92eda79824e13911f34c35e7b65bf557c9907c60 SHA256 0d06b3b6fe1a80837d6e34117a6c6801eabe4402d1165c747f37b201e19ca4f7
-DIST AdobeReader_ita-8.1.2_SU1-1.i486.tar.bz2 49461750 RMD160 1fe91dd09ddb05f9b6068ef09f0b7f0580a83efb SHA1 af110b44007ef18abde3f171c8fed1695796020b SHA256 9f95f845a1cca5f30475a67a16934573c01110294272a43ea23d45a1757dbd89
+DIST AdobeReader_fra-8.1.4-1.i486.tar.bz2 49841357 RMD160 e78642df0c5b174240b1db8295449df071acfbb9 SHA1 a408d60e5d2440e62c65ad90f8a9319347b1531b SHA256 253ae3c91ff8a86148dd30138657b2698c7affdf659ee26057b72a3ddce63ca4
 DIST AdobeReader_ita-8.1.3-1.i486.tar.bz2 49461556 RMD160 b6218bc0c2ebb5c610f52906105cabffac029482 SHA1 ca30731a60357999a9740a4a161957ae761aac28 SHA256 231d10326ba6e490e2fad2e5cb16558ee7a704480b17620f7b88256e8faab0a2
-DIST AdobeReader_jpn-8.1.2_SU1-1.i486.tar.bz2 57744667 RMD160 e71dac9feecafc309c5e1d68575c0c69a4763c23 SHA1 689c9a5257ce1c4037b0bcf0e8c7224dcbd195b3 SHA256 93225caf7439bd73dbc030376585f4a4dd941a56f80a37a5637b321e65b05017
+DIST AdobeReader_ita-8.1.4-1.i486.tar.bz2 49461085 RMD160 0cec2435c1db9b084f4e3ccab0de50bc64653ba0 SHA1 a67d6dd093aaed9ef8e8ebd6228b7be6672a1dc1 SHA256 bca2be85b18b7a7e9f136fa81098bae14f4a4719b2b2a2c447bf81d83d353f26
 DIST AdobeReader_jpn-8.1.3-1.i486.tar.bz2 57741189 RMD160 a34b57a5fa83c23aa9cc5d53cb18c3798f72d4a3 SHA1 2853a8695b5f9aa2ce81f4c6a9040ac7eb445695 SHA256 286db094e6cc3196f8747637811cd71f5e80526fae542f49c8b0a909b8045615
-DIST AdobeReader_kor-8.1.2_SU1-1.i486.tar.bz2 50961054 RMD160 4a948eef853c0ede5e726603604d17f9609866c9 SHA1 ecff448ab64312533e4be609cb93307270af5653 SHA256 3b77c7f24b56777e8400c8284b021d018f3409c3557fc8d64564fa121c9cd516
+DIST AdobeReader_jpn-8.1.4-1.i486.tar.bz2 57733313 RMD160 44531d5cf09235551cbc6db36b6239cefb37399e SHA1 1a65961ea1cb1e4a24485273e1c0497b1366c615 SHA256 011f5bbd43101a32b1b99699c923bed62c4fe111aa4818733808f760ec8046c1
 DIST AdobeReader_kor-8.1.3-1.i486.tar.bz2 50967421 RMD160 a04a8590931c9c378420f23da9bb5eb987915773 SHA1 c240a3261ced31611a386c1253f38fd90df8dcc7 SHA256 bf69c910543bb2b0beced285843a63f8eea0c06b055018924f8b849b02b794d6
-DIST AdobeReader_nld-8.1.2_SU1-1.i486.tar.bz2 49777523 RMD160 9d01f017f514c14e7db7ee8ecd2cdd571abebcb8 SHA1 d9872d2cb580d0172d799b44d51fff2f3a8b45da SHA256 4bc8508c938cacbe6c45a39024159387fb772353903e982fc6cae72b23b20ac1
+DIST AdobeReader_kor-8.1.4-1.i486.tar.bz2 50995045 RMD160 f3835771804fbaf2b8d39df76cf63c81a68dc5cd SHA1 d30cf1a35acc5a320d1cbe901f5416758d7cdbd1 SHA256 9bb4a697b8d3ef604a47552c429156683177eb4df4b51b5542e6f5d67aaccdf3
 DIST AdobeReader_nld-8.1.3-1.i486.tar.bz2 49790536 RMD160 5a09fbe8d392322029b0530034db56e22b9d69af SHA1 8e2358a407a26a38db1f77ee67fb16858ff9a5a5 SHA256 1a03680f0d222a68786544f19acedf8ae665877fa71e0efb741aa8f8e4c7be46
-DIST AdobeReader_nor-8.1.2_SU1-1.i486.tar.bz2 49767047 RMD160 596f3f0c6e625afee04357f8f767bd6631948c01 SHA1 815fbc28d6d3173e5d948fbbba68e5bbc667fcce SHA256 0aa42ebb497f412729a08124f22ad8687599188d3e9ee2a31923fca7ddf0364a
+DIST AdobeReader_nld-8.1.4-1.i486.tar.bz2 49777380 RMD160 2f014c68ae553596daec0cc4e6351758e29176b6 SHA1 3b80027b154b45e2837a7dc9a7819bbb28cbc594 SHA256 9dbb49d01b63a64067389c705b3235efa8d29ae859ddaea620c515ded928de2d
 DIST AdobeReader_nor-8.1.3-1.i486.tar.bz2 49788549 RMD160 ffe319adc2e7ca37a395b0e51a62b4de94e39524 SHA1 4b948479e2debc70311b2f9cea6ae92bec7ecf80 SHA256 fd9ac64c6dd8eda40aa54891f135d6880bf909d5078b41bb9974ee698415bad3
-DIST AdobeReader_ptb-8.1.2_SU1-1.i486.tar.bz2 49584114 RMD160 4d638860a3511d802e03ef9933b2c50504aecf7d SHA1 f4d4cace493dbdd6bef8c243c0dcbcda780089b2 SHA256 0bf3532a5b398a23f56dffcc5e9d0d0b9818774ed201a40495b0c965716522c3
+DIST AdobeReader_nor-8.1.4-1.i486.tar.bz2 49808524 RMD160 2bd7e5073f036c7d76a565115ec952d3f5f7e091 SHA1 19ba92cea309b70da0817ae6ab0a10e33447db74 SHA256 b4079a904f70f5b5b447a2349f915db7cb6a52bcd384f93c5ddf0c49490826db
 DIST AdobeReader_ptb-8.1.3-1.i486.tar.bz2 49598922 RMD160 2721800e493a453b5c271025c953de614849f469 SHA1 8874f3931d1d95579a1e346fe798221392a50d35 SHA256 4fc8734d0220f626146ae5c98c8b3a433875a779d2d126aec4446d29f789b4ac
-DIST AdobeReader_suo-8.1.2_SU1-1.i486.tar.bz2 49687936 RMD160 b4a7f78717db8d42dedd1cda245d2eebf6510f7a SHA1 99299a35725b2ac8e35ad906502bb97d8fc8ca1d SHA256 678d5bef1dcd3ed9f1c0b7e76748a395557db5c80092dcc468e6672c7131a167
+DIST AdobeReader_ptb-8.1.4-1.i486.tar.bz2 49589443 RMD160 2cf6cc9ac5f66d4d55c9f55e6778c48ae026b888 SHA1 3d92e69dfeecce1be6133d876bd8148612887d22 SHA256 e61d479fd42c0cfac3984c99c81ad81084ea787d778b3c2f6757511afb556207
 DIST AdobeReader_suo-8.1.3-1.i486.tar.bz2 49681666 RMD160 69be61196f603cb88276ad6172543cb21dae60cf SHA1 9dd20550d95c9ba5d6188b6e679ae2f46e2b52f3 SHA256 6c06b7dea872bd3ce625a5d7ecb607ab8b981c2209e137874a2892142d88dcc6
-DIST AdobeReader_sve-8.1.2_SU1-1.i486.tar.bz2 50507124 RMD160 885aba68d5225cd638b400f995cfca70bdbf7569 SHA1 0e7528d461e258721da8766d478258d3c56fe64d SHA256 1e7d46e39cd8b6a10c08bdfd2e48f3d55d540be46573992366c3d45dceaf70b1
+DIST AdobeReader_suo-8.1.4-1.i486.tar.bz2 49712455 RMD160 654623044356406ab2d60e2fdc4d5a33b52b72e2 SHA1 e4bd8afd93f3e793db85d466e19f5dcf2cfc5ad7 SHA256 6099fc527e9097e770a77f91d048a3920921fbd1134e1155a0b860c4f4efda7d
 DIST AdobeReader_sve-8.1.3-1.i486.tar.bz2 50519768 RMD160 3f755791922e9533434e9ab86ed0409ce34d61d5 SHA1 ab1ac2119832aa186dd019e386923f5ec021f721 SHA256 b2a2f9f5ce3cef8d0704961f509cc097d103bb3205e706caff82bc249bdc4eca
-EBUILD acroread-8.1.2-r3.ebuild 8042 RMD160 b8af38490a86f246dab85f57beb85bf9bdf67a47 SHA1 d572a45eca1a743d1326f7a46c3ba3554dbaa3ff SHA256 137be6def812fa0b77f3c7b930a82ef704207d39cc4ca745f27138691d060329
+DIST AdobeReader_sve-8.1.4-1.i486.tar.bz2 50543341 RMD160 686d89f60451d3cb6eb55f767255872b177fea21 SHA1 30e9b013a74cbf134820f34eb36ba7d393f7f82c SHA256 46638699e6be6a6304c9431a90cf79b2da9823a21e6d4be37026898e2bbea8d7
 EBUILD acroread-8.1.3.ebuild 8140 RMD160 68b013685a5fd34d337e43919911495c765557c0 SHA1 98eb75b5e8b90e70d2c7a5d167366339f8d1ae80 SHA256 fa0c5d9efbd7a9edb040fcb71694571b24a852a9f15ede9ebea52fabfa53117e
-MISC ChangeLog 21683 RMD160 77478cbf14ccc4cc97311e08a88d4e7920392945 SHA1 31b7c51aa368f931714374f928c42808f0805d95 SHA256 83100b751e95a46015bc6201f170b5d5335503da0a969413519708c7fb7a8803
+EBUILD acroread-8.1.4.ebuild 8371 RMD160 aa9e9bbb131bf38bb47d30fe8621de0d97f5a08a SHA1 f134023ce7a304fe4b448ed61693cf2119f73e07 SHA256 bb31185b9d53ed00f18cf3a3d71cad91cfdaed32fab7e803dbafe9d9b5f751e0
+EBUILD acroread-9.1.0.ebuild 8005 RMD160 ba6f9b4e1baaeb05c66c73252bffc97a53dddeee SHA1 31259a426d42e05e356b73f0f23c47e77d26b568 SHA256 d3c081a4a818df3f71ffc4fd69905c13283e745d0c9f89b98f5c08d356b8b25a
+MISC ChangeLog 21990 RMD160 782783a5f85bde3adc52557fa2d385c180c1428e SHA1 0bc16d4eaba168d31291a5f91d984385a629bfe6 SHA256 d127a6b5b8a32502bc5b73cc080b6cfd16e299571f2cfce5d98b538c4916bae2
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkVlfcACgkQkKaRLQcq0GJwTwCeKv+k6Aq6Yv9/IslI4AcUo8xh
-XkEAnj5MfUgexZLDPga5xSBi7YdVN2E/
-=ILdA
------END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-8.1.2-r3.ebuild b/app-text/acroread/acroread-8.1.4.ebuild
index c1e2cfcc09bd..94123ab3943e 100644
--- a/app-text/acroread/acroread-8.1.2-r3.ebuild
+++ b/app-text/acroread/acroread-8.1.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.2-r3.ebuild,v 1.4 2008/10/05 20:32:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.4.ebuild,v 1.1 2009/04/06 22:25:41 tgurr Exp $
 
-inherit eutils nsplugins
+inherit eutils gnome2-utils nsplugins
 
 DESCRIPTION="Adobe's PDF reader"
-HOMEPAGE="http://www.adobe.com/products/acrobat/"
+HOMEPAGE="http://www.adobe.com/products/reader/"
 IUSE="cups ldap minimal nsplugin"
 
 SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}"
-SRC_FOOT="-${PV}_SU1-1.i486.tar.bz2"
+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}"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="Adobe"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip mirror"
 
 # mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
@@ -65,7 +65,6 @@ LAUNCHERS="Adobe/Reader8/bin/acroread"
 
 pkg_setup() {
 	# x86 binary package, ABI=x86
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
 	has_multilib_profile && ABI="x86"
 }
 
@@ -126,7 +125,7 @@ src_unpack() {
 		for launcher in ${LAUNCHERS} ; do
 			cat > ${launcher} <<-EOF
 				#!/bin/bash
-				# Copyright 1999-2008 Gentoo Foundation
+				# Copyright 1999-2009 Gentoo Foundation
 				# Distributed under the terms of the GNU General Public License v2
 				#
 				# Automatically generated by ${CATEGORY}/${PF}
@@ -163,36 +162,33 @@ src_unpack() {
 }
 
 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
+	domenu Adobe/Reader8/Resource/Support || die "Installing desktop files failed."
+
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins Adobe/Reader8/Resource/Icons/${res}/* || die "Installing icons failed."
+	done
 
-	dodir /opt
+	dodir /opt || die "Creating directoy failed."
 	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 Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt
+	dodoc Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt || die "Installing docs failed."
 
 	if use nsplugin ; then
 		exeinto /opt/netscape/plugins
-		doexe Adobe/Reader8/Browser/intellinux/nppdf.so
+		doexe Adobe/Reader8/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
 		inst_plugin /opt/netscape/plugins/nppdf.so
 	fi
 
-	if ! use ldap ; then
-		rm "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
-	fi
-
-	dodir /opt/bin
+	dodir /opt/bin || die "Creating directory failed."
 	for launcher in ${LAUNCHERS} ; do
-		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} || die "Installing launcher symlinks failed."
 	done
 
 	# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
@@ -222,28 +218,43 @@ src_install() {
 	fi
 }
 
-pkg_postinst () {
-	use ldap ||
-		elog "The Adobe Reader security plugin can be enabled with USE=\"ldap\"."
-
-	use nsplugin ||
-		elog "The Adobe Reader browser plugin can be enabled with USE=\"nsplugin\"."
+pkg_preinst() {
+	gnome2_icon_savelist
+}
 
+pkg_postinst () {
 	local ll lc
 	lc=0
 	for ll in ${LINGUA_LIST} ; do
 		use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
 	done
 	if [[ ${lc} > 1 ]] ; then
+		echo
 		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."
+		echo
 	fi
 
 	if use minimal ; then
+		echo
 		ewarn "If you want html support and/or view the Adobe Reader help you have"
 		ewarn "to re-emerge acroread with USE=\"-minimal\"."
+		echo
+	fi
+
+	if use nsplugin ; then
+		echo
+		elog "If you're running a 64bit browser you may also want to install"
+		elog "\"net-www/nspluginwrapper\" to be able to use the Adobe Reader browser plugin."
+		echo
 	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/app-text/acroread/acroread-9.1.0.ebuild b/app-text/acroread/acroread-9.1.0.ebuild
new file mode 100644
index 000000000000..0416a76e7735
--- /dev/null
+++ b/app-text/acroread/acroread-9.1.0.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.1.0.ebuild,v 1.1 2009/04/06 22:25:41 tgurr Exp $
+
+inherit eutils gnome2-utils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+IUSE="cups ldap minimal nsplugin"
+
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1"
+SRC_FOOT=".tar.bz2"
+
+# languages not available yet: it:ita es:esp pt:ptb sv:sve zh_CN:chs zh_TW:cht fi:suo nb:nor nl:nld ko:kor da:dan
+LINGUA_LIST="de:deu en:enu fr:fra ja:jpn"
+DEFAULT_URI="${SRC_HEAD}/enu/AdbeRdr${PV}-1_i486linux_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}/AdbeRdr${PV}-1_i486linux_${src_l}${SRC_FOOT} )"
+done
+SRC_URI="${SRC_URI}
+	${DEFAULT_URI}"
+
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip mirror"
+
+# mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
+RDEPEND="media-libs/fontconfig
+	cups? ( net-print/cups )
+	x86? ( >=x11-libs/gtk+-2.0
+			ldap? ( net-nds/openldap )
+			!minimal? ( || ( net-libs/xulrunner
+						net-libs/xulrunner-bin
+						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
+			!minimal? ( || ( net-libs/xulrunner-bin
+						www-client/seamonkey-bin ) ) )"
+
+QA_EXECSTACK="opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
+	opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
+	opt/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/PPKLite.api"
+
+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/Reader9/bin/acroread"
+#	Adobe/HelpViewer/1.0/intellinux/bin/ahv"
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	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}"
+		tar xf ILINXR.TAR || die "Failed to unpack ILINXR.TAR."
+		tar xf COMMON.TAR || die "Failed to unpack COMMON.TAR."
+		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
+	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).
+		#
+		# HelpViewer is new - We don't know if Adobe are likely to
+		# internationalize it or not.
+		for launcher in ${LAUNCHERS} ; do
+			cat > ${launcher} <<-EOF
+				#!/bin/bash
+				# Copyright 1999-2009 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 particular for LANG=C)
+			cat >> ${launcher} <<-EOF
+				*) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
+				esac
+			EOF
+			chmod 755 ${launcher}
+		done
+	fi
+
+	# remove cruft
+	rm "${S}"/Adobe/Reader9/bin/UNINSTALL
+	rm "${S}"/Adobe/Reader9/Browser/install_browser_plugin
+	rm "${S}"/Adobe/Reader9/Resource/Support/vnd.*.desktop
+
+	# replace some configuration sections
+	for binfile in "${S}"/Adobe/Reader9/bin/* ; do
+		sed -i -e '/Font-config/,+9d' \
+			-e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
+			"${binfile}" || die "sed configuration settings failed."
+	done
+}
+
+src_install() {
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop || die "Installing desktop files failed."
+
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins Adobe/Reader9/Resource/Icons/${res}/* || die "Installing icons failed."
+	done
+
+	dodir /opt || die "Creating directoy failed."
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${D}"opt/
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz || die "Installing manpage failed."
+
+	if use nsplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	dodir /opt/bin || die "Creating directory failed."
+	for launcher in ${LAUNCHERS} ; do
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} || die "Installing launcher symlinks failed."
+	done
+
+	# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
+	# they don't install a configuration file for libgtkembedmoz.so
+	# detection in /etc/gre.d/ like xulrunner does.
+	if ! use minimal ; then
+		if use x86 ; then
+			for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
+				if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+					echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
+					elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+					elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
+					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
+					echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
+					elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+					elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
+					break # don't search any more libraries
+				fi
+			done
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst () {
+	local ll lc
+	lc=0
+	for ll in ${LINGUA_LIST} ; do
+		use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
+	done
+	if [[ ${lc} > 1 ]] ; then
+		echo
+		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."
+		echo
+	fi
+
+	if use minimal ; then
+		echo
+		ewarn "If you want html support and/or view the Adobe Reader help you have"
+		ewarn "to re-emerge acroread with USE=\"-minimal\"."
+		echo
+	fi
+
+	if use nsplugin ; then
+		echo
+		elog "If you're running a 64bit browser you may also want to install"
+		elog "\"net-www/nspluginwrapper\" to be able to use the Adobe Reader browser plugin."
+		echo
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}