Version bump to latest secure version, drop older. Cleanup ebuild to lose the linguas support as last release with them was 9.1 and add html useflag (renamed from minimal) wrt bug#332075.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

6 files changed, 227 insertions, 588 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index d9a7ae04e09e..5bf2cbd30858 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/acroread
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.191 2012/12/19 16:57:44 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.192 2013/02/21 19:36:47 scarabeus Exp $
+
+*acroread-9.5.4 (21 Feb 2013)
+
+  21 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> +acroread-9.5.4.ebuild,
+  -acroread-9.5.1-r1.ebuild, -acroread-9.5.1.ebuild, metadata.xml:
+  Version bump to latest secure version, drop older. Cleanup ebuild to lose the
+  linguas support as last release with them was 9.1 and add html useflag
+  (renamed from minimal) wrt bug#332075.
 
   19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   acroread-9.5.1.ebuild, acroread-9.5.1-r1.ebuild:
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index cf4d4fb8a27e..75eaa0bf115b 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -2,19 +2,24 @@
 Hash: SHA256
 
 AUX gentoo_config 356 SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f SHA512 b7779960461a2b8d674373c1430dc57bd9965e9847d850f7cec4f75c85491c1f3fb838d2abadc61fc3d35bff7d605714c3711b59693bc9f05fafbd7e4c08c0d4 WHIRLPOOL 65db71ef0ff319bbd7907f3c67dace468675b53a5e98d05c0bfe591c3b82164edfffc3b4a8a01f6a25342c4eae8abf6a54fb64135ecd397039ef2c7fa0be5356
-DIST AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 57138807 SHA256 a6bcb881d5de4fb58c00fe24c3541122123881a3148a9feb0f62eda8dd82bca6 SHA512 2ec60b28ea93089dabdf0c766469c776d98e4cf305254ecf2377424d59590bd57d3d570c2c2d5aea2ff8fbe40cf356f1752d2f80cb45cd3e5945b631996b76ad WHIRLPOOL ee6c75b8170558817e4a3925a671f2f7aa795e4178d8922069927bc1d2897303f3bab2d329059bc458d2115ebf1e3fa8b5811340fd0277bad506b9a8d48254c7
-EBUILD acroread-9.5.1-r1.ebuild 9613 SHA256 fbdd9408a20df6e8e25e579d133797b77516afeb1ea328ecceb7a84e178ffc0a SHA512 8f252be74779378e19d43d5ca78758d97e3c29d1ea81deaf0fff79f2985789106e61d80033513336b438ee0ea2b4629e470629a54497e3668e9108ad23640731 WHIRLPOOL 7e8e6e9bca687dde8de960e7a57160e739365291e40f63173c152544ac208a091f971a66cfbdaa02ee680cbd2bf457e12ad6479d7c58a3b8ca32cece4e959bbe
-EBUILD acroread-9.5.1.ebuild 8858 SHA256 5c089b7a2246d200aad0fd7937266b4c5a51382a41763f8e3a9efeb9a01d97bc SHA512 2b19f9f50b89990ceb06d338e219978b5645779c374b431688ec79f8f518888be4621973e8a2410996dda119424c33a0a8c3b5404962fe05699621b8b007d153 WHIRLPOOL ca2edc2fd151a32e9450037534c00aef8912eb8901c4c9688e703c3744c8b33bd18db731bb0e5219ec9fa410dfe6c63b6dcf0bc3187ec56e8238613b36451e75
-MISC ChangeLog 31700 SHA256 6b2499f25e049f0faedc95beda18f3ee669670f7be039fc95ee4f097fee42b3b SHA512 9471bebf0278fc7369d8ef8e9f8683f535504d9172ce04754994decbf2049a98d27e8d446da6024d6683d7241e2bb6c484ccf088f2f663ad78ad46a73922c5b8 WHIRLPOOL 57a42d87cc6b64c32f4ecbdc66cad66123fcbf3ca572f5568ddc3e6b7891086ed407f2cd4e3146df68ce23b29bba5dbae7527c5fe083bee246b9ce3bd3d55818
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
+DIST AdbeRdr9.5.4-1_i486linux_enu.tar.bz2 57174420 SHA256 48abcdfe2f135134d71b8586f03ab38e85cede4810c832b15b21aead54b02200 SHA512 b1cca078d036b9fa25bef0fbc2a94ee577d22e20bc11f2056a9f26530e47462d936010f17d18d10da2092571f2154e3d67d140715de4abfdfde46ac8316b0989 WHIRLPOOL 6066eba2d335a2efcdd340b4fd5e2109ef398bc0bc4d80252584095649f3cf6b919d85ccf8fc68c619bc9b51d07e19a1e629f1efa70d8376ab52f0bfb91f1fcc
+EBUILD acroread-9.5.4.ebuild 6326 SHA256 d6f0b61113d766659f1951a9012b9b5890064c265766358db2ff6ceeb6238739 SHA512 1b197f061bd593dbf9ae20500f6950ad472a4e7b6f3f7403077d4376e9d3902cc7b227e1a94eb16c13b62e32c950ff5c8aa278e0d70f9d3d4a919af7225197c7 WHIRLPOOL f58c5212cdd28a5569f896909ec2f7ae61192b36c83372a24edf43176eedae2a4d79d84a615fe0bb9eb04019e17f372299c4f847a3c14f1897e025e49e8eb91d
+MISC ChangeLog 32072 SHA256 8244f01fc970c19247aef1ed31cbe1e37a61dadb70434f973d3a20b56c13de7d SHA512 f901aa9569e8db78ecc761b9d24243d6edb8d0a45f0ae8e3c4057281ddb3a5185c3242cb1c8d2aadaa2ce6946ddb30caf03569c54d8e9ee09cae6b7d8123e953 WHIRLPOOL d0989bf57fcee4f89640dd385a722c65ae3323eed1d9655c7e809c43b3061e8076a0b5b4b12b364b2fbe0f7d1f5c88fbf28e5a681b7615352757a20f7a10693a
+MISC metadata.xml 257 SHA256 bda1e4362fabecfeafa40683399ef5580cf9f9c79aa097dc8695c9966393198d SHA512 b1571019d9d9a1e6161c01fe6720dc582c2e68eb9eea867734c2950a5068c267ba52b0bcbe62317f623bab3d8f5e2a01d44740236dd4eb132a8ff6aeab59f010 WHIRLPOOL 062e0479dcf0c2c4ec813519d595e256843f6cdc6658d9f6020966842eb4a1757dbe7d083d44762c8a5ad1714bd9823e8e7d3ce54ee4f5e2a778ccccb3d03009
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0fIJAAoJEJ0WA1zPCt1h4K4IAJadJRXdoyN9d+SXe8SJJH9q
-TahX/mbzQV9gqYAjwyCUVl39O19AjnJbZyCzZNWaYfhToTKfLLrfKXRFAr55tI/D
-8bSo3izvBscy1A+hHqkWFtzeavbWZIqSfyc8MqQ/ufr0sr0L9Qfft1Do2CcIuvD7
-exYK9b3BEqTAx7b87bd+cc0M8Du2B7HH2wdJ5z2ctVgs+ydVbzEB2IZQgjMBBUh1
-EJETWwCZsm7cwobhW229zzEiU+8PpVXW5j85bSG8uDgEwdVY5cFJjsakiJ4KF2lU
-DqBZxKkTWTfhM+PmfdQctUa9xyTDrrO1oh3MGntRRdsJVrO74d1qwXfU0Ro+C2Y=
-=+04t
+iQIcBAEBCAAGBQJRJndQAAoJEOSiRoyO7jvoQgoP/3mUe/zGKM2vJdp8WIW/3RS9
+NzFwxYE3TyeKq9ECDjY2xraHHDYgY1GI3VsGlk3wVo6OOEJnTy9LGyIiRCsYhGTt
+S0K1zKlQ4WNjZpO4KS9icgNv2Ho6iOLtejbp1Y+NgFgMGuxxrAQUc+bpB4ytA5iR
+yYJOPdFDNV91cATqF2P9Sgi51oMuQMl2R+eEeYhrA0m5CaJ0c8OxjuF7cjdP/OiI
+DtrCELcV/TmaneRYHm/Wrr8+l8B9A255/hZ83q3b4LBC/tEbONqleA8r6qkPjy0W
+GppuaADtEub7Fghw1udPJdoumolbBcRTC/oMSLTEZieTr/2d2MF8XwWWuQBcArik
+70xYbN6D1n5YkMm2rV6aEZjxlgV+/ifhqelEVBwR7EO50QBTq0gmx44utSXoXnmG
+W1GwJVkT93QvuyaE2866MvvRAoVSSOMghtehuf4RY1Imw5yGrz0Md5MovlDMsRS+
+K8IWs+CCuydlV7S5ODrQ3F73xgrsO6pPGT6DgC/yLtovG6uWcIExqsWhbTV0302X
+tTa6JBAABTrFCYV3faWHWlKSZrOvARo7iwiUXLURwX4Kt2+deBO0O0hewgmWuIdy
+CK5MI8GN1w50BLgmPYb6aJd5pkypl+hy9InFyVPbWFyxGLUXdLfr2Y1bcYVOErUT
+gKH9RioGfQvpgshFtJ5h
+=V6XE
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.5.1-r1.ebuild b/app-text/acroread/acroread-9.5.1-r1.ebuild
deleted file mode 100644
index d2e8b4da648c..000000000000
--- a/app-text/acroread/acroread-9.5.1-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.1-r1.ebuild,v 1.7 2012/12/19 16:57:44 tetromino Exp $
-
-EAPI=4
-
-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/${PV}"
-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 de:deu fr:fra ja:jpn
-# asian fonts are handled separately
-LINGUA_LIST="en:enu"
-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
-
-# asian fonts from separate package:
-IUSE="${IUSE} linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-SRC_URI="${SRC_URI}
-	${DEFAULT_URI}"
-
-LICENSE="Adobe"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
-RESTRICT="strip mirror"
-
-DEPEND="dev-util/bsdiff"
-
-# mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
-RDEPEND="media-libs/fontconfig
-	x86? ( =dev-libs/openssl-0.9.8* )
-	cups? ( net-print/cups )
-	x86? ( x11-libs/gtk+:2 x11-libs/pango[X] net-dns/libidn
-			|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
-			ldap? ( net-nds/openldap )
-			!minimal? ( || ( www-client/firefox
-						www-client/firefox-bin
-						www-client/seamonkey ) ) )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs )
-	linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
-	linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )
-	linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] )
-	linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )"
-
-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"
-
-QA_FLAGS_IGNORED="opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
-	opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
-	opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
-	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
-	opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
-	opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
-	opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
-	opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
-	opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
-	opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
-	opt/Adobe/Reader9/Browser/intellinux/nppdf.so
-	opt/netscape/plugins/nppdf.so"
-
-QA_TEXTRELS="opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so"
-
-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"
-
-# remove bundled libs to force use of system version, bug 340527
-REMOVELIBS="libcrypto libssl"
-
-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
-
-	# fix erroneous Exec entry in .desktop
-	sed -i -e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
-		"${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
-		||die "sed .desktop fix failed"
-
-	# fix braindead error in nppdf.so (bug 412051)
-	base64 -d > "${WORKDIR}/nppdf.so.patch" << ENDOFFILE
-QlNESUZGNDBIAAAAAAAAAC8AAAAAAAAAYL0CAAAAAABCWmg5MUFZJlNZFBL6EAAAFvBh+DwgDAgQ
-QAAAEABAIAAgACICaGjJtQoaaYAFPzpGDIjiUXSFYEuGy1ix8XckU4UJAUEvoQBCWmg5MUFZJlNZ
-jrYrlQABYGAAwAAIAAAIIAAwzAUppgKbECni7kinChIR1sVyoEJaaDkxQVkmU1kzGPRGAAAAEYAA
-AIYFAwAgACIHqbUIYAdBF8XckU4UJAzGPRGA
-ENDOFFILE
-	einfo "Patching nppdf.so"
-	mv Adobe/Reader9/Browser/intellinux/nppdf.so Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die
-	bspatch Adobe/Reader9/Browser/intellinux/nppdf.so.orig Adobe/Reader9/Browser/intellinux/nppdf.so "${WORKDIR}/nppdf.so.patch" || die
-	rm Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die
-}
-
-src_install() {
-	# Install desktop files
-	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
-
-	# 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}/*
-	done
-
-	dodir /opt
-	chown -R --dereference -L root:0 Adobe
-	cp -dpR Adobe "${ED}"opt/ || die
-
-	# remove some bundled libs
-	for mylib in ${REMOVELIBS} ; do
-		einfo Removing bundled ${mylib}
-		rm -v "${ED}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
-	done
-
-	doman Adobe/Reader9/Resource/Shell/acroread.1.gz
-
-	if use nsplugin ; then
-		exeinto /opt/netscape/plugins
-		doexe Adobe/Reader9/Browser/intellinux/nppdf.so
-		inst_plugin /opt/netscape/plugins/nppdf.so
-	fi
-
-	dodir /opt/bin
-	for launcher in ${LAUNCHERS} ; do
-		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
-	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 did.
-	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}" >> "${ED}"${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 "\"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.5.1.ebuild b/app-text/acroread/acroread-9.5.1.ebuild
deleted file mode 100644
index 2447882b387a..000000000000
--- a/app-text/acroread/acroread-9.5.1.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.1.ebuild,v 1.7 2012/12/19 16:57:44 tetromino Exp $
-
-EAPI=4
-
-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/${PV}"
-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 de:deu fr:fra ja:jpn
-# asian fonts are handled separately
-LINGUA_LIST="en:enu"
-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
-
-# asian fonts from separate package:
-IUSE="${IUSE} linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-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
-	x86? ( =dev-libs/openssl-0.9.8* )
-	cups? ( net-print/cups )
-	x86? ( x11-libs/gtk+:2 x11-libs/pango[X] net-dns/libidn
-			|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
-			ldap? ( net-nds/openldap )
-			!minimal? ( || ( www-client/firefox
-						www-client/firefox-bin
-						www-client/seamonkey ) ) )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs )
-	linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
-	linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )
-	linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] )
-	linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )"
-
-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"
-
-QA_FLAGS_IGNORED="opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
-	opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
-	opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
-	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
-	opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
-	opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
-	opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
-	opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
-	opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
-	opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
-	opt/Adobe/Reader9/Browser/intellinux/nppdf.so
-	opt/netscape/plugins/nppdf.so"
-
-QA_TEXTRELS="opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so"
-
-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"
-
-# remove bundled libs to force use of system version, bug 340527
-REMOVELIBS="libcrypto libssl"
-
-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
-
-	# fix erroneous Exec entry in .desktop
-	sed -i -e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
-		"${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
-		||die "sed .desktop fix failed"
-}
-
-src_install() {
-	# Install desktop files
-	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
-
-	# 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}/*
-	done
-
-	dodir /opt
-	chown -R --dereference -L root:0 Adobe
-	cp -dpR Adobe "${D}"opt/ || die
-
-	# remove some bundled libs
-	for mylib in ${REMOVELIBS} ; do
-		einfo Removing bundled ${mylib}
-		rm -v "${D}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
-	done
-
-	doman Adobe/Reader9/Resource/Shell/acroread.1.gz
-
-	if use nsplugin ; then
-		exeinto /opt/netscape/plugins
-		doexe Adobe/Reader9/Browser/intellinux/nppdf.so
-		inst_plugin /opt/netscape/plugins/nppdf.so
-	fi
-
-	dodir /opt/bin
-	for launcher in ${LAUNCHERS} ; do
-		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
-	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 did.
-	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
-	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.5.4.ebuild b/app-text/acroread/acroread-9.5.4.ebuild
new file mode 100644
index 000000000000..0c23cbca6edb
--- /dev/null
+++ b/app-text/acroread/acroread-9.5.4.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.4.ebuild,v 1.1 2013/02/21 19:36:47 scarabeus Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+SRC_URI="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}/enu/AdbeRdr${PV}-1_i486linux_enu.tar.bz2"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+
+LICENSE="Adobe"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cups html ldap nsplugin"
+# asian fonts from separate package:
+IUSE+=" linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="strip mirror"
+
+DEPEND="dev-util/bsdiff"
+RDEPEND="media-libs/fontconfig
+	x86? ( =dev-libs/openssl-0.9.8* )
+	cups? ( net-print/cups )
+	x86? (
+		x11-libs/gtk+:2
+		x11-libs/pango[X]
+		net-dns/libidn
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
+		ldap? ( net-nds/openldap )
+		html? (
+			|| (
+				www-client/firefox
+				www-client/firefox-bin
+				www-client/seamonkey
+			)
+		)
+	)
+	amd64? (
+		app-emulation/emul-linux-x86-gtklibs
+		app-emulation/emul-linux-x86-baselibs
+	)
+	linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
+	linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )
+	linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] )
+	linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )"
+
+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
+"
+QA_FLAGS_IGNORED="
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
+	opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
+	opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
+	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
+	opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
+	opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
+	opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	opt/netscape/plugins/nppdf.so
+"
+QA_TEXTRELS="opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so"
+
+INSTALLDIR=/opt
+
+S="${WORKDIR}/AdobeReader"
+
+# remove bundled libs to force use of system version, bug 340527
+REMOVELIBS="libcrypto libssl"
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	has_multilib_profile && ABI="x86"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	tar xf ILINXR.TAR || die "Failed to unpack ILINXR.TAR."
+	tar xf COMMON.TAR || die "Failed to unpack COMMON.TAR."
+}
+
+src_prepare() {
+	# 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
+
+	# fix erroneous Exec entry in .desktop
+	sed -i \
+		-e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
+		"${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
+		||die "sed .desktop fix failed"
+
+	# fix braindead error in nppdf.so (bug 412051)
+	base64 -d > "${WORKDIR}/nppdf.so.patch" << ENDOFFILE
+QlNESUZGNDBIAAAAAAAAAC8AAAAAAAAAYL0CAAAAAABCWmg5MUFZJlNZFBL6EAAAFvBh+DwgDAgQ
+QAAAEABAIAAgACICaGjJtQoaaYAFPzpGDIjiUXSFYEuGy1ix8XckU4UJAUEvoQBCWmg5MUFZJlNZ
+jrYrlQABYGAAwAAIAAAIIAAwzAUppgKbECni7kinChIR1sVyoEJaaDkxQVkmU1kzGPRGAAAAEYAA
+AIYFAwAgACIHqbUIYAdBF8XckU4UJAzGPRGA
+ENDOFFILE
+	einfo "Patching nppdf.so"
+	mv Adobe/Reader9/Browser/intellinux/nppdf.so Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die
+	bspatch Adobe/Reader9/Browser/intellinux/nppdf.so.orig Adobe/Reader9/Browser/intellinux/nppdf.so "${WORKDIR}/nppdf.so.patch" || die
+	rm Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die
+}
+
+src_install() {
+	local LAUNCHER="Adobe/Reader9/bin/acroread"
+
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
+
+	# 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}/*
+	done
+
+	dodir /opt
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${ED}"opt/ || die
+
+	# remove some bundled libs
+	for mylib in ${REMOVELIBS}; do
+		einfo Removing bundled ${mylib}
+		rm -v "${ED}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
+	done
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz
+
+	if use nsplugin; then
+		exeinto /opt/netscape/plugins
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	dodir /opt/bin
+	dosym /opt/${LAUNCHER} /opt/bin/${LAUNCHER/*bin\/}
+
+	# 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 did.
+	if use x86 && use html; 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}" >> "${ED}"${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
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst () {
+	if use x86 && ! use html; then
+		echo
+		ewarn "If you want html support and/or view the Adobe Reader help you have"
+		ewarn "to re-emerge acroread with USE=\"html\"."
+		echo
+	fi
+
+	if use amd64 && use nsplugin && ! has_version www-plugins/nspluginwrapper; 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/metadata.xml b/app-text/acroread/metadata.xml
index 1fa0ca569505..a799f700d3b0 100644
--- a/app-text/acroread/metadata.xml
+++ b/app-text/acroread/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>printing</herd>
+<use>
+	<flag name="html">HTML support and help reading capability (only for x86).</flag>
+</use>
 </pkgmetadata>