Version bump, remove old.

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

4 files changed, 15 insertions, 296 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 15ddc246ef1e..18ce5c03c5f5 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,12 @@
 # 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.132 2009/08/01 14:26:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.133 2009/10/21 22:38:55 tgurr Exp $
+
+*acroread-9.2 (21 Oct 2009)
+
+  21 Oct 2009; Timo Gurr <tgurr@gentoo.org> -acroread-8.1.6.ebuild,
+  -acroread-9.1.2.ebuild, +acroread-9.2.ebuild:
+  Version bump, remove old.
 
   01 Aug 2009; Markus Meier <maekke@gentoo.org> acroread-9.1.3.ebuild:
   amd64/x86 stable, bug #278813
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 88b4f683f782..d2c7ff1bda16 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,39 +1,13 @@
------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 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.6-1.i486.tar.bz2 54087890 RMD160 e27a1999e667420a1ca594147e26e96b0fa10f42 SHA1 7ed4c62fc5342f9a43e32408dbdbc5ff9945f01b SHA256 0c5f544b2d22062f14ce190c6895c3899f567717923271bf88372651a2217ca4
-DIST AdobeReader_dan-8.1.6-1.i486.tar.bz2 49610816 RMD160 875962f0ba391a8d462fe4cc6cb5415c5b66ebb3 SHA1 55ae96449774e382976e0c60ff5ccc91904395e1 SHA256 d9a0752349f7f7496df5a4aeb4b47aade8b688ca2a1999a957986db51220dff4
-DIST AdobeReader_deu-8.1.6-1.i486.tar.bz2 50316501 RMD160 d791b286f2483e433a46ebed3c39e8a8f5c7f34a SHA1 4207ab432c758e8913b5f04e6fa744e024f4bc2c SHA256 bdac7e69d08c0d978b11343d073a2d096e30aee880c37fc622e46ecbb38c72f4
-DIST AdobeReader_enu-8.1.6-1.i486.tar.bz2 47032897 RMD160 be5440df7eadde72d62b7e3b797fa29115bff7fb SHA1 403350336dfdf810ff3eca743a2e5c7588f1b5d1 SHA256 fa866abaf9815144729036d1c1c7d97957d098771ac142612da53cd4d70e013f
-DIST AdobeReader_esp-8.1.6-1.i486.tar.bz2 49591771 RMD160 8da2910956fc4e59ad0d361114093061005d4243 SHA1 7f1ec315cc7688cd0e88fe4f5c00a87ca5142beb SHA256 4897f080c641d384513747a15c71881d4720f3a7838ea4c3936d846c35969cc1
-DIST AdobeReader_fra-8.1.6-1.i486.tar.bz2 49857080 RMD160 e8bd4d46aa91460ad4bb70389513b46afdceef43 SHA1 d2a59e1ff77c63fca7a04fb3d3500a9af2cf7cb4 SHA256 00a2e30ddddbee893c88affc71cbd8587c09c8135ccd9bfc2e19817b7629462d
-DIST AdobeReader_ita-8.1.6-1.i486.tar.bz2 49466926 RMD160 53819e4ff3db19a01f1fd72ea0991a4121e2bf2c SHA1 132d93768ffdb6a67342e7eb1fee27871e5f340a SHA256 a15fcdab7ff867401472f40a4ce97f0d6bf3b09c295263a54d164a57363de7f7
-DIST AdobeReader_jpn-8.1.6-1.i486.tar.bz2 57779784 RMD160 544bd0520a5aa11b30d790403299fb360d70ba32 SHA1 d629d3a26a9793e70d9be9a2d41e93b6f1d1cf49 SHA256 425e97ec78a5b4ba0834d69529570b073e5557e01b38f5a822fdcca8debfa6e7
-DIST AdobeReader_kor-8.1.6-1.i486.tar.bz2 51014759 RMD160 f667eb10be542b49ab638ed95cf1d203c53cac38 SHA1 52d7f9d5c4b1573d540c169f051727cd7acac839 SHA256 49b0c9e69a3cb90db3f25cb966608f670b726114554e775295f463c9e8468771
-DIST AdobeReader_nld-8.1.6-1.i486.tar.bz2 49792337 RMD160 97e0fc7872832966229dcd8874b4c3978c585864 SHA1 15e302c9b9f3e2e1738c6cd803f6b067bf73082c SHA256 d4e09abf8ea804750b31d537f75b4821877ce57b55247c0297f58e308d9fe3f9
-DIST AdobeReader_nor-8.1.6-1.i486.tar.bz2 49811643 RMD160 b3b473441fa30f3c136f88275ed467c1e67467bd SHA1 752606d80ec07df757de3a316345511a4fe2af68 SHA256 727d36f7ee5be13b1a9f28be5da5f258dcec64aaf5300609aeb2a219bb0c3cd2
-DIST AdobeReader_ptb-8.1.6-1.i486.tar.bz2 49603450 RMD160 14955ec720e5bd6dd7057be04610c4f1f001f0ca SHA1 a03357b2cefdcbcaabd02a9828c1798d17b5d33b SHA256 2d379d77d703e89a97b360500e26c3e9e50fdbbf3d4255adb185ee87d6c14a0f
-DIST AdobeReader_suo-8.1.6-1.i486.tar.bz2 49705056 RMD160 cae4c079eb365ba2975744096f1b2019ac3ae5bf SHA1 a22723edc01e2cfe7803a0a852b96946187ea5e6 SHA256 ffb2635410271cd6a1d44c307d9cd1767d29e5136f4f033c1c142eb3c08266e7
-DIST AdobeReader_sve-8.1.6-1.i486.tar.bz2 50561590 RMD160 405a3d5cd55d846e4058bd79ee823f6949fe001c SHA1 3795bb621a41a061c789169ff4763a549b56be9b SHA256 2448379b8d999365a7704c36a4c4827344e932fb3eddc1ef855ff086d151c2f8
-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
+DIST AdbeRdr9.2-1_i486linux_deu.tar.bz2 65875869 RMD160 c2bd5ddda1c5deca67b79b12fa093cbf92b832f4 SHA1 b7fc80be308cbaa22de2d8e38f5dedf3bc28d95e SHA256 5590de8277086996f23c919632d1f5441e9d0fb1a75e16272569d3093b97aedf
+DIST AdbeRdr9.2-1_i486linux_enu.tar.bz2 60249306 RMD160 add862e19c0d7f9fbac790291f60a7c3b61377bb SHA1 205ba085914693ebc4dc64624f2d8bf3f9af92a6 SHA256 8226e6b018ea3cfa71eafe0bdb298e7326a2d9c689a127c82080092927e0c700
+DIST AdbeRdr9.2-1_i486linux_fra.tar.bz2 64558958 RMD160 fcdd470aef2d96cb3dbf0e95760937ab47da847e SHA1 dfa6759425d4d2f2a89b8bb2daeba41dd6625eaa SHA256 1509f544a515ab62573eeab1f195f453a99d28d4e7426a8c2a09777c61ca7133
+DIST AdbeRdr9.2-1_i486linux_jpn.tar.bz2 68398224 RMD160 fa70a8d511a7ae980b353827aadd5ed3e0eb1a21 SHA1 61e5e7c67b9ebd23fcff5ce49f5dba4c568a5cfe SHA256 29a6c6a76f11874b7b6b9f9cea71063b1bb92ac3ad1163d0fcb73f9c9face28b
 EBUILD acroread-9.1.3.ebuild 8019 RMD160 b102c3ec6a00a2e469e6e7a1f1afbdf7f110438e SHA1 00bd04bd5911d7c482616eadde643b0d463be322 SHA256 c7ac8b65b7aad0324edd96271e4d5776812eb5e0e631eda4d214c6348b794935
-MISC ChangeLog 23369 RMD160 1846b49b4904d0da089546ac0cdb638425e0039d SHA1 25d489dfc2d406ac77b8be523b6e90a2319cdb2d SHA256 25d1e1fa468ed9ccf9eb96127280d29d52d0273ddbb02b986a997abeae312a26
+EBUILD acroread-9.2.ebuild 8018 RMD160 22190ed86ab5d6a6c9c68f14b7950fd196cad4b8 SHA1 5e311ff1c0753359782a0d672a93c2d5fbd94eb3 SHA256 2d78031e635ec061160b97262a78f463cb6ab9bb14728439a751ed363b9da360
+MISC ChangeLog 23542 RMD160 4abd119604fe5c6139115ecedfe4b2a4d24dc835 SHA1 f2155980e23d28a1d5d61c6ec76bbe547c8761d8 SHA256 7fe3c153ab512993ea5f47a9711891ccb2b3f816cfc6a4b4c206bbe14dcee393
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp0ULoACgkQkKaRLQcq0GLx4QCeLzmpkrK4tg3CiMBDyO/f0PJH
-OjoAn3hhwno5IGwe9oLSABKiXDyEo+T3
-=qpRA
------END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-8.1.6.ebuild b/app-text/acroread/acroread-8.1.6.ebuild
deleted file mode 100644
index 0287960b03d4..000000000000
--- a/app-text/acroread/acroread-8.1.6.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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.6.ebuild,v 1.3 2009/06/21 19:09:30 keytoaster 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/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}"
-
-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_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"
-
-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
-	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?"
-			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).
-		#
-		# 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/Reader8/bin/UNINSTALL
-	rm "${S}"/Adobe/Reader8/Resource/Support/vnd.*.desktop
-
-	# replace some configuration sections
-	for binfile in "${S}"/Adobe/Reader8/bin/* ; do
-		sed -i -e '/Font-config/,+10d' \
-			-e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
-			"${binfile}" || die "sed failed"
-	done
-}
-
-src_install() {
-	# Install desktop files
-	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 || 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."
-
-	if use nsplugin ; then
-		exeinto /opt/netscape/plugins
-		doexe Adobe/Reader8/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/Reader8/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."
-					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/Reader8/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."
-					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 "\"www-plugins/nspluginwrapper\" to be able to use the Adobe Reader"
-		elog "browser plugin."
-		echo
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-text/acroread/acroread-9.1.2.ebuild b/app-text/acroread/acroread-9.2.ebuild
index d40742417c12..507f7a61547b 100644
--- a/app-text/acroread/acroread-9.1.2.ebuild
+++ b/app-text/acroread/acroread-9.2.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-9.1.2.ebuild,v 1.3 2009/06/21 19:09:30 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.2.ebuild,v 1.1 2009/10/21 22:38:55 tgurr Exp $
 
 inherit eutils gnome2-utils nsplugins
 
@@ -27,7 +27,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