revbump to fix some gx86-multilib deps and clean up the *DEPEND a little

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 225 insertions, 17 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 1a89f9151ba4..47baf1281779 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.203 2014/06/18 19:03:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.204 2014/10/22 20:17:07 axs Exp $
+
+*acroread-9.5.5-r1 (22 Oct 2014)
+
+  22 Oct 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +acroread-9.5.5-r1.ebuild:
+  revbump to fix some gx86-multilib deps and clean up the *DEPEND a little
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> acroread-9.5.5.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 32c18f76dbb1..be76f84be2d0 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -3,25 +3,14 @@ Hash: SHA256
 
 AUX gentoo_config 356 SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f SHA512 b7779960461a2b8d674373c1430dc57bd9965e9847d850f7cec4f75c85491c1f3fb838d2abadc61fc3d35bff7d605714c3711b59693bc9f05fafbd7e4c08c0d4 WHIRLPOOL 65db71ef0ff319bbd7907f3c67dace468675b53a5e98d05c0bfe591c3b82164edfffc3b4a8a01f6a25342c4eae8abf6a54fb64135ecd397039ef2c7fa0be5356
 DIST AdbeRdr9.5.5-1_i486linux_enu.tar.bz2 57127348 SHA256 ee0ea9c65b38abd40ec7c92654e767dc138757f02aef5ae92f74e2dc75ac6540 SHA512 0d60f9c0248432445fb0e6ccbc6d7841ed3e63dad61765436c53098b15c2ede77f1dd6369b04004cec020c20df395f195c4aaf464a6e2761e57a9e9ea0cb5361 WHIRLPOOL 16ae019b3f1bc5b54a31af53e14788223ceed06483563dd4f5fdd7cd7356496188bbd95b04582dd768c4853998706c41cbb5c2b7a9dda99133e712e04b4dba59
+EBUILD acroread-9.5.5-r1.ebuild 6905 SHA256 7e8cccd0dd5ef718bc993ac1f2e56fdb2a45971957fe5a5f5a1d016cd89dd635 SHA512 2a50b8d837ae35827f4682460844767dfd731530f61f858fcfa58436ac9a3fb88ba309269180330cac0d266bce869fa515e2fd8c345e4a3caf08b31c8d5562eb WHIRLPOOL 4333a761fad31c6597db7df5f69aabf53c06682758cd4d42e9d560a88680e5515ef791571b43e0a07d5bc871f534a99d1e077a2af22855eed23b3105b24cb62f
 EBUILD acroread-9.5.5.ebuild 6781 SHA256 3dcc0c8cd8e85369f82bd3e98f856b11314a4f18f7c682b2ec908bd37711fa2f SHA512 fa2b4433715a95d4ebbc91069ed43e53869e466943a5f79e9727a1155d172d395a861bcc741d95c7b9519588cdcac86dd26f4bb23d3f04138244967afb54bf0e WHIRLPOOL 897518f14985d96603f278ec917e3ee267cd31a063cbe3595219ffac730f62db4728a3b280d39441489c981f22741ae0a92c0541b01a3769cbb5d014391e6df2
-MISC ChangeLog 33485 SHA256 0536eb1b3815b2eab2a4453b1b3159c31ba0a40347c6bfd4b904b79cdf92272a SHA512 ec8d0809909f9cb1b33585406f34f744d2fdbbb155d9e5ceb08a9ea563002117c96aeb33519cf73a60266b863700751ee4c7a50bda801a6b60be19b8492f0fe2 WHIRLPOOL 034704fcac0fdb4c15b6e3339a40d1678a70ff59ee630d7d761ba6492456c3efd5b245e7cc4c36b4418860bed7588706246dd5b0907c9009e2922be185c2a7da
+MISC ChangeLog 33678 SHA256 b7182685ebbcb6ce26f4aaf64b926276ed0762e7b917bd854f7a4d85dc26de95 SHA512 88fa1b57bd3a0abcfd2cd84312dd34cc184f118f1230ab0cfe566e42007d56261ffc8c8bb6fc315a71f1ce0dcaa746351acda38a9c8908ed7c7ad4e8762b0e71 WHIRLPOOL ffbc43f2fe48d24e6d661184fbd3cc1be15b3328ccf103ffb89f2cc2a8b0cddcda7ac10bb6907cc21e90f508eb7729e3c043cfe4292cd13464eb10c4c7afd7f6
 MISC metadata.xml 257 SHA256 bda1e4362fabecfeafa40683399ef5580cf9f9c79aa097dc8695c9966393198d SHA512 b1571019d9d9a1e6161c01fe6720dc582c2e68eb9eea867734c2950a5068c267ba52b0bcbe62317f623bab3d8f5e2a01d44740236dd4eb132a8ff6aeab59f010 WHIRLPOOL 062e0479dcf0c2c4ec813519d595e256843f6cdc6658d9f6020966842eb4a1757dbe7d083d44762c8a5ad1714bd9823e8e7d3ce54ee4f5e2a778ccccb3d03009
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJToeJzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOk1UP/iXS4DC4CA/N42ro0qwljt61
-L977OHBK33RfadHMXy4M3j7wKWJXoCpjGwVa1nWM5LVdLlwh0uvgPsUvVmrSm8zK
-ZsKpmAFmvqmGbMygsHyd5lw4nI+BxMatUKUsAcgL/C7+VfeQcAkV149LW+P4LMvT
-D29OLyZK3+uSOxL/0GR2jw+CZjwrZjaioNxyVOmeki24sT0Ktsh6dUuE58RGrw6f
-SZJcY0nQheNBnfOhRLA+GR++ZRZAKhoKtKSiql+tZslhf6r1z7SBi98hRGGBxGj9
-IOr0810XUidllWLyscAELfdTVAI+2E9i6TDmxXmorutBHiPXPhtt+psQDcUOXSbA
-oO+IzI+TVPt0zM/dw5OLsRAmKCzdeLtfhD2eI2kRYRM1UcnDY8dnfLQRfpy4JHtM
-wTR9XjQmPatoNm64koqSXHqJGHPTUniBdGItMtvVIGGa1QM4S/Tvmt/zzFq4VN2w
-kmLUtDt7w91tZq6x92sJ7WpjSMWeS4gdcIH79z1x1BdFYoPIEV8r02E98UfP38aM
-26ZNi+PsLCENSNPaLRLotAkFlSDPW2Y10gSMnWlhbr72INZ047xlEL/BotuhUaCU
-rRQBOtgwvYLPt5HBPJwd/pzOGCIRxcSlb6IUIrE8BjKIXn/M3fAhYU7pH21WXSIL
-LcVzfKssG9uF7URfFzRz
-=RdJB
+iF4EAREIAAYFAlRIENIACgkQ2ugaI38ACPDAugD/WLz0L0SkwNKzKJF+TVgq4PPo
+jU0HykM0t9sMnbX547YA/Rvd1mX0l7ELkODa+dcojbBCxLD+OmyD7FRSGctf5mWd
+=p4oM
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.5.5-r1.ebuild b/app-text/acroread/acroread-9.5.5-r1.ebuild
new file mode 100644
index 000000000000..f41eb560cd61
--- /dev/null
+++ b/app-text/acroread/acroread-9.5.5-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5-r1.ebuild,v 1.1 2014/10/22 20:17:07 axs 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"
+
+CORE_RDEPEND="dev-libs/openssl:0.9.8[abi_x86_32(-)]
+	dev-libs/libxml2[abi_x86_32(-)]
+	>=net-dns/libidn-1.28[abi_x86_32(-)]
+	ldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)] )
+	>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+	|| (
+		>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
+		( <x11-libs/pango-1.31[X] x11-libs/pango[abi_x86_32(-)] )
+	)
+"
+
+DEPEND="dev-util/bsdiff"
+RDEPEND="media-libs/fontconfig
+	cups? ( net-print/cups )
+	x86? (
+		${CORE_RDEPEND/\[abi_x86_32(-)\]/}
+		html? ( || (
+			www-client/firefox
+			www-client/firefox-bin
+			www-client/seamonkey
+		) )
+	)
+	amd64? ( || (
+		( ${CORE_RDEPEND} )
+		(
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		)
+	) )
+	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/libextendscript.so
+	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}"
+	# lowercase tar extension required for unpack, bug 476734
+	mv ./ILINXR.TAR ./ILINXR.tar || die
+	mv ./COMMON.TAR ./COMMON.tar || die
+	unpack ./ILINXR.tar ./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; then
+		if 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."
+		fi
+		elog ""
+		elog "If you find that Adobe Reader doesn't match your desktop's theme, you"
+		elog "may want to re-emerge the relevant gtk theme package with"
+		elog "USE=\"abi_x86_32\" enabled."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}