Version bump, fixes 9.x only security issue (CVE-2009-1862), see bug #278813. Remove old.

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

3 files changed, 54 insertions, 76 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 79c433d2d993..4881476ac4d5 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.130 2009/06/21 19:09:30 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.131 2009/07/31 16:03:41 tgurr Exp $
+
+*acroread-9.1.3 (31 Jul 2009)
+
+  31 Jul 2009; Timo Gurr <tgurr@gentoo.org> -acroread-8.1.4.ebuild,
+  +acroread-9.1.3.ebuild:
+  Version bump, fixes 9.x only security issue (CVE-2009-1862), see bug
+  #278813. Remove old.
 
   21 Jun 2009; Tobias Heinlein <keytoaster@gentoo.org>
   acroread-8.1.6.ebuild, acroread-9.1.2.ebuild:
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 73650c2be1ca..4b9901d23d8f 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,50 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gentoo_config 356 RMD160 fde2e1f78d39d39611ea91fc94f8c31bc8634425 SHA1 ce38b7160e842d970804216e156d5edbcbfd3e1d SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f
 DIST AdbeRdr9.1.2-1_i486linux_deu.tar.bz2 65727420 RMD160 efd9c6a065e0f06f6ad91e394718b516b4c49bf4 SHA1 16940db06581862688e2507622d5a4fc129c1175 SHA256 8c58b3b761ef865ddcc75527e69a0879dc86fca7668aacd1471faa97df95ee2f
 DIST AdbeRdr9.1.2-1_i486linux_enu.tar.bz2 60074973 RMD160 4afb206648faf3e0e39e4583a2a84bb79f7702d3 SHA1 7e56534462c5fb48a5038890f166ed13b6ac5727 SHA256 ab1dbda5c2af1f30bd82d4eb3e0a0f4a0c3ace97634b3b10eec8dfcbbea099d2
 DIST AdbeRdr9.1.2-1_i486linux_fra.tar.bz2 64530111 RMD160 8f5d9c69c768a9f803927a8c21fe92c4433e2ff1 SHA1 b5f2aafcec5aa835067d0713c296a48bd6bbb186 SHA256 e94456808939a83ca1c79cb92a7c719cfa3f1ed26ec9958811ab53252485b25b
 DIST AdbeRdr9.1.2-1_i486linux_jpn.tar.bz2 68423341 RMD160 794a03883a73da4175ca98740e799c6f2c8ec4c3 SHA1 52086b4cf78a113f5e644b00c6ac2df97f939062 SHA256 a23e352249fbcc563e82f617a9efa92854b5af85877f884f3fae4bf80f44265c
-DIST AdobeReader_chs-8.1.4-1.i486.tar.bz2 58147908 RMD160 3957e82fcbb91bc6160eab713377bed69b36168e SHA1 e686ccf5a933d234ce3692285fc58a69888010fe SHA256 cdbd1885b1918ad24ad5bb8a118bb978c843374a424b04273dae52a8f0ad09da
+DIST AdbeRdr9.1.3-1_i486linux_deu.tar.bz2 65719225 RMD160 44379637e8a65d50397e931a35cc576e3156bd35 SHA1 47b195ba986c73905bb44c2717d959e2e5cfe3d4 SHA256 c1f7983d4b68c3e624254a8ec860bb2c1f8211414e04792cd1b89e9a7ad6d651
+DIST AdbeRdr9.1.3-1_i486linux_enu.tar.bz2 60073815 RMD160 21500891a04444dc1e2d9315d9a4e4feb5c75af8 SHA1 2307c85b603216a52d17d0ef4f05c905b7dc9db2 SHA256 8dfa1fc70fc065fdccc42c53c7c2e3a8d43a8f9ca061bc6be44740dc370d2d9f
+DIST AdbeRdr9.1.3-1_i486linux_fra.tar.bz2 64540661 RMD160 680df3008757685604c84e5c28c2e11a4933b48a SHA1 796b00681f95bee175064d7f0d6b3c1108ec7f1e SHA256 562594aed884707bfe86f630e962ff592237c9d9aae3eb62c2624418fe347fea
+DIST AdbeRdr9.1.3-1_i486linux_jpn.tar.bz2 68430621 RMD160 7e4691597051744d2f64c2cc1536b705a29d7464 SHA1 975c6c27818f34c0a181d960f819a03a88c94faf SHA256 e369cea8616dd30fee48ee8ad151987afb2299b1510465574ace405904f23800
 DIST AdobeReader_chs-8.1.6-1.i486.tar.bz2 58177390 RMD160 7797ffa9d00aada5d377fe74fef3c9d658a55dd6 SHA1 9542057ee136348945a62d6519a12bc4d73baf97 SHA256 65f3e84ba4c3db85212cacfadc42e5243b1e44614daa71b094be344bc651cd92
-DIST AdobeReader_cht-8.1.4-1.i486.tar.bz2 54082943 RMD160 0fbafa9f19c127ed6501212972ba05b50cee3dfa SHA1 016460c8a219e8d68c2cdd248ab3376fe6cf6e70 SHA256 4ae7fb58eb71dba168bb4ddd96970a56dc182d6dbadb2324954584a2896f8b80
 DIST AdobeReader_cht-8.1.6-1.i486.tar.bz2 54087890 RMD160 e27a1999e667420a1ca594147e26e96b0fa10f42 SHA1 7ed4c62fc5342f9a43e32408dbdbc5ff9945f01b SHA256 0c5f544b2d22062f14ce190c6895c3899f567717923271bf88372651a2217ca4
-DIST AdobeReader_dan-8.1.4-1.i486.tar.bz2 49553888 RMD160 0104ca19cb4e56ef27040bdb619b0973083676ef SHA1 94803f7cb59a75dc22bcf75d0ef92e5f0ab0b46f SHA256 7b2df45efc575f87e8e8379cce17ef45b2e45c028baf2a39098816830f71b8b6
 DIST AdobeReader_dan-8.1.6-1.i486.tar.bz2 49610816 RMD160 875962f0ba391a8d462fe4cc6cb5415c5b66ebb3 SHA1 55ae96449774e382976e0c60ff5ccc91904395e1 SHA256 d9a0752349f7f7496df5a4aeb4b47aade8b688ca2a1999a957986db51220dff4
-DIST AdobeReader_deu-8.1.4-1.i486.tar.bz2 50288644 RMD160 dc60bc6be628ae8146fab4c424b5d0960498123c SHA1 5bac666f300f7072605345a51991595da12224b1 SHA256 e0f96776feda1b340c57b4fb553d2d1f4378d20c15dba14337b42e7787af9724
 DIST AdobeReader_deu-8.1.6-1.i486.tar.bz2 50316501 RMD160 d791b286f2483e433a46ebed3c39e8a8f5c7f34a SHA1 4207ab432c758e8913b5f04e6fa744e024f4bc2c SHA256 bdac7e69d08c0d978b11343d073a2d096e30aee880c37fc622e46ecbb38c72f4
-DIST AdobeReader_enu-8.1.4-1.i486.tar.bz2 47035382 RMD160 c253cbb070a338103070acc9164ae6bfa837ce38 SHA1 c81477edd7427bb451e462cfa1801fc33ee7c514 SHA256 137d63aeecc74cfd1e84d352e6e7f7e4b6563950a9313d46b0bb5fc8c48ab076
 DIST AdobeReader_enu-8.1.6-1.i486.tar.bz2 47032897 RMD160 be5440df7eadde72d62b7e3b797fa29115bff7fb SHA1 403350336dfdf810ff3eca743a2e5c7588f1b5d1 SHA256 fa866abaf9815144729036d1c1c7d97957d098771ac142612da53cd4d70e013f
-DIST AdobeReader_esp-8.1.4-1.i486.tar.bz2 49587160 RMD160 ebec72a98dc11e030664adc2eb9ed82b22ddf3d0 SHA1 806c68c39764a03795f5ad8bc7fe5c22c938c6a0 SHA256 82f4ff3bd93f7e672270b2bf48040fcb789a6459e209bd81fccbbf0636b4001b
 DIST AdobeReader_esp-8.1.6-1.i486.tar.bz2 49591771 RMD160 8da2910956fc4e59ad0d361114093061005d4243 SHA1 7f1ec315cc7688cd0e88fe4f5c00a87ca5142beb SHA256 4897f080c641d384513747a15c71881d4720f3a7838ea4c3936d846c35969cc1
-DIST AdobeReader_fra-8.1.4-1.i486.tar.bz2 49841357 RMD160 e78642df0c5b174240b1db8295449df071acfbb9 SHA1 a408d60e5d2440e62c65ad90f8a9319347b1531b SHA256 253ae3c91ff8a86148dd30138657b2698c7affdf659ee26057b72a3ddce63ca4
 DIST AdobeReader_fra-8.1.6-1.i486.tar.bz2 49857080 RMD160 e8bd4d46aa91460ad4bb70389513b46afdceef43 SHA1 d2a59e1ff77c63fca7a04fb3d3500a9af2cf7cb4 SHA256 00a2e30ddddbee893c88affc71cbd8587c09c8135ccd9bfc2e19817b7629462d
-DIST AdobeReader_ita-8.1.4-1.i486.tar.bz2 49461085 RMD160 0cec2435c1db9b084f4e3ccab0de50bc64653ba0 SHA1 a67d6dd093aaed9ef8e8ebd6228b7be6672a1dc1 SHA256 bca2be85b18b7a7e9f136fa81098bae14f4a4719b2b2a2c447bf81d83d353f26
 DIST AdobeReader_ita-8.1.6-1.i486.tar.bz2 49466926 RMD160 53819e4ff3db19a01f1fd72ea0991a4121e2bf2c SHA1 132d93768ffdb6a67342e7eb1fee27871e5f340a SHA256 a15fcdab7ff867401472f40a4ce97f0d6bf3b09c295263a54d164a57363de7f7
-DIST AdobeReader_jpn-8.1.4-1.i486.tar.bz2 57733313 RMD160 44531d5cf09235551cbc6db36b6239cefb37399e SHA1 1a65961ea1cb1e4a24485273e1c0497b1366c615 SHA256 011f5bbd43101a32b1b99699c923bed62c4fe111aa4818733808f760ec8046c1
 DIST AdobeReader_jpn-8.1.6-1.i486.tar.bz2 57779784 RMD160 544bd0520a5aa11b30d790403299fb360d70ba32 SHA1 d629d3a26a9793e70d9be9a2d41e93b6f1d1cf49 SHA256 425e97ec78a5b4ba0834d69529570b073e5557e01b38f5a822fdcca8debfa6e7
-DIST AdobeReader_kor-8.1.4-1.i486.tar.bz2 50995045 RMD160 f3835771804fbaf2b8d39df76cf63c81a68dc5cd SHA1 d30cf1a35acc5a320d1cbe901f5416758d7cdbd1 SHA256 9bb4a697b8d3ef604a47552c429156683177eb4df4b51b5542e6f5d67aaccdf3
 DIST AdobeReader_kor-8.1.6-1.i486.tar.bz2 51014759 RMD160 f667eb10be542b49ab638ed95cf1d203c53cac38 SHA1 52d7f9d5c4b1573d540c169f051727cd7acac839 SHA256 49b0c9e69a3cb90db3f25cb966608f670b726114554e775295f463c9e8468771
-DIST AdobeReader_nld-8.1.4-1.i486.tar.bz2 49777380 RMD160 2f014c68ae553596daec0cc4e6351758e29176b6 SHA1 3b80027b154b45e2837a7dc9a7819bbb28cbc594 SHA256 9dbb49d01b63a64067389c705b3235efa8d29ae859ddaea620c515ded928de2d
 DIST AdobeReader_nld-8.1.6-1.i486.tar.bz2 49792337 RMD160 97e0fc7872832966229dcd8874b4c3978c585864 SHA1 15e302c9b9f3e2e1738c6cd803f6b067bf73082c SHA256 d4e09abf8ea804750b31d537f75b4821877ce57b55247c0297f58e308d9fe3f9
-DIST AdobeReader_nor-8.1.4-1.i486.tar.bz2 49808524 RMD160 2bd7e5073f036c7d76a565115ec952d3f5f7e091 SHA1 19ba92cea309b70da0817ae6ab0a10e33447db74 SHA256 b4079a904f70f5b5b447a2349f915db7cb6a52bcd384f93c5ddf0c49490826db
 DIST AdobeReader_nor-8.1.6-1.i486.tar.bz2 49811643 RMD160 b3b473441fa30f3c136f88275ed467c1e67467bd SHA1 752606d80ec07df757de3a316345511a4fe2af68 SHA256 727d36f7ee5be13b1a9f28be5da5f258dcec64aaf5300609aeb2a219bb0c3cd2
-DIST AdobeReader_ptb-8.1.4-1.i486.tar.bz2 49589443 RMD160 2cf6cc9ac5f66d4d55c9f55e6778c48ae026b888 SHA1 3d92e69dfeecce1be6133d876bd8148612887d22 SHA256 e61d479fd42c0cfac3984c99c81ad81084ea787d778b3c2f6757511afb556207
 DIST AdobeReader_ptb-8.1.6-1.i486.tar.bz2 49603450 RMD160 14955ec720e5bd6dd7057be04610c4f1f001f0ca SHA1 a03357b2cefdcbcaabd02a9828c1798d17b5d33b SHA256 2d379d77d703e89a97b360500e26c3e9e50fdbbf3d4255adb185ee87d6c14a0f
-DIST AdobeReader_suo-8.1.4-1.i486.tar.bz2 49712455 RMD160 654623044356406ab2d60e2fdc4d5a33b52b72e2 SHA1 e4bd8afd93f3e793db85d466e19f5dcf2cfc5ad7 SHA256 6099fc527e9097e770a77f91d048a3920921fbd1134e1155a0b860c4f4efda7d
 DIST AdobeReader_suo-8.1.6-1.i486.tar.bz2 49705056 RMD160 cae4c079eb365ba2975744096f1b2019ac3ae5bf SHA1 a22723edc01e2cfe7803a0a852b96946187ea5e6 SHA256 ffb2635410271cd6a1d44c307d9cd1767d29e5136f4f033c1c142eb3c08266e7
-DIST AdobeReader_sve-8.1.4-1.i486.tar.bz2 50543341 RMD160 686d89f60451d3cb6eb55f767255872b177fea21 SHA1 30e9b013a74cbf134820f34eb36ba7d393f7f82c SHA256 46638699e6be6a6304c9431a90cf79b2da9823a21e6d4be37026898e2bbea8d7
 DIST AdobeReader_sve-8.1.6-1.i486.tar.bz2 50561590 RMD160 405a3d5cd55d846e4058bd79ee823f6949fe001c SHA1 3795bb621a41a061c789169ff4763a549b56be9b SHA256 2448379b8d999365a7704c36a4c4827344e932fb3eddc1ef855ff086d151c2f8
-EBUILD acroread-8.1.4.ebuild 8384 RMD160 33f99213dada0e6a0b10cd6bdd95ea8c43fb500d SHA1 3e2aced940b7e9a966170cfe5b7ca63133077b84 SHA256 a50481cd406d2f920e0e3fafd5ed1f6a41267c36fde122d8e960bc9e8f748e25
 EBUILD acroread-8.1.6.ebuild 8387 RMD160 5852b57152d0b7b64da97b0e31d585d8b578e792 SHA1 7ea4a7ecc7e53acc1a59a8ba98391555c70d78ec SHA256 702a3a3bc249fe63ca981f56320256645a31c4cdec6d9a1bdbd1c4a57f4bd71e
 EBUILD acroread-9.1.2.ebuild 8023 RMD160 7f9b824ee5c54e95cb9a97a4786b0f44ad7d0ac1 SHA1 951fcd1aeb656a040f8ef1a53f458c8ab440236f SHA256 1641fd744941ecb2e2d4d89f39552b399775033add0fcf8115d8bcca9f12834f
-MISC ChangeLog 23049 RMD160 028cd619eeac9ba21cc32c57e7f114aeb09a0eae SHA1 4496f90b87a28cb3b42adf00a17193656e0c9823 SHA256 06f8a4c568c28d9862e5b974270ec9763e2ba04fb90c4abfba0c7e35904da2f6
+EBUILD acroread-9.1.3.ebuild 8020 RMD160 ac1064578ad050d5bc0ff5a99b41ba55746d58ee SHA1 93a19c7678357d3908d5ab624d18363ada8498eb SHA256 7f11cfdca9bdc3a87b20f7ebaa760b4ade45dbfe678fd5ae4a1283acff8dd58e
+MISC ChangeLog 23264 RMD160 cb72d0a76abd9119880eec3a55a0da72033c987d SHA1 c404acd15d71107ce07062826cbc6cd8929bf066 SHA256 bcd12bc067869bef247059a85059926bcf0a43cdc46afaa80408f67949e93dfa
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAko+hXwACgkQt3UOBHx+2m+j4QCeNXkWv4zlocHWLQd/REwpc+6u
-JNYAnRXHcKwb3TNsGFSPfNUXY8DCSWaE
-=lbC+
------END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-8.1.4.ebuild b/app-text/acroread/acroread-9.1.3.ebuild
index f86a4af955b0..1d24a3ed3055 100644
--- a/app-text/acroread/acroread-8.1.4.ebuild
+++ b/app-text/acroread/acroread-9.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.4 2009/04/14 10:25:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.1.3.ebuild,v 1.1 2009/07/31 16:03:41 tgurr Exp $
 
 inherit eutils gnome2-utils nsplugins
 
@@ -8,25 +8,26 @@ 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/8.x/${PV}"
-SRC_FOOT="-${PV}-1.i486.tar.bz2"
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}"
+SRC_FOOT=".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}"
+# 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}/AdobeReader_${src_l}${SRC_FOOT} )"
+		${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"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip mirror"
 
 # mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
@@ -43,15 +44,12 @@ RDEPEND="media-libs/fontconfig
 			>=app-emulation/emul-linux-x86-gtklibs-2.0
 			!minimal? ( || ( net-libs/xulrunner-bin
 						www-client/seamonkey-bin ) ) )"
-QA_TEXTRELS="opt/Adobe/Reader8/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"
+
+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
 
@@ -60,7 +58,7 @@ 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"
+LAUNCHERS="Adobe/Reader9/bin/acroread"
 #	Adobe/HelpViewer/1.0/intellinux/bin/ahv"
 
 pkg_setup() {
@@ -92,21 +90,17 @@ src_unpack() {
 		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?"
-			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
+		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
@@ -150,39 +144,37 @@ src_unpack() {
 	fi
 
 	# remove cruft
-	rm "${S}"/Adobe/Reader8/bin/UNINSTALL
-	rm "${S}"/Adobe/Reader8/Resource/Support/vnd.*.desktop
+	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/Reader8/bin/* ; do
-		sed -i -e '/Font-config/,+10d' \
+	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 failed"
+			"${binfile}" || die "sed configuration settings failed."
 	done
 }
 
 src_install() {
 	# Install desktop files
-	domenu Adobe/Reader8/Resource/Support || die "Installing desktop files failed."
+	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/Reader8/Resource/Icons/${res}/* || die "Installing icons failed."
+		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/
 
-	# 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 || die "Installing docs failed."
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz || die "Installing manpage failed."
 
 	if use nsplugin ; then
 		exeinto /opt/netscape/plugins
-		doexe Adobe/Reader8/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
 		inst_plugin /opt/netscape/plugins/nppdf.so
 	fi
 
@@ -198,9 +190,9 @@ src_install() {
 		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/Reader8/Reader/GlobalPrefs/mozilla_config
+					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/Reader8/Reader/GlobalPrefs/mozilla_config."
+					elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
 					break # don't search any more libraries
 				fi
 			done
@@ -208,9 +200,9 @@ src_install() {
 		if use amd64 ; then
 			for lib in /opt/seamonkey ; do
 				if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
-					echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/GlobalPrefs/mozilla_config
+					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/Reader8/Reader/GlobalPrefs/mozilla_config."
+					elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
 					break # don't search any more libraries
 				fi
 			done