Version bump, bug 469912

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 208 insertions, 22 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 237adc9784b8..bd66e68d4b04 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.195 2013/06/09 22:07:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.196 2013/07/07 17:03:45 dilfridge Exp $
+
+*acroread-9.5.5 (07 Jul 2013)
+
+  07 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +acroread-9.5.5.ebuild:
+  Version bump, bug 469912
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> acroread-9.5.4.ebuild:
   Use `unpack` rather than `tar xf`.
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 68cdc8c76d1e..bd92d86d4c0a 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,25 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gentoo_config 356 SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f SHA512 b7779960461a2b8d674373c1430dc57bd9965e9847d850f7cec4f75c85491c1f3fb838d2abadc61fc3d35bff7d605714c3711b59693bc9f05fafbd7e4c08c0d4 WHIRLPOOL 65db71ef0ff319bbd7907f3c67dace468675b53a5e98d05c0bfe591c3b82164edfffc3b4a8a01f6a25342c4eae8abf6a54fb64135ecd397039ef2c7fa0be5356
 DIST AdbeRdr9.5.4-1_i486linux_enu.tar.bz2 57174420 SHA256 48abcdfe2f135134d71b8586f03ab38e85cede4810c832b15b21aead54b02200 SHA512 b1cca078d036b9fa25bef0fbc2a94ee577d22e20bc11f2056a9f26530e47462d936010f17d18d10da2092571f2154e3d67d140715de4abfdfde46ac8316b0989 WHIRLPOOL 6066eba2d335a2efcdd340b4fd5e2109ef398bc0bc4d80252584095649f3cf6b919d85ccf8fc68c619bc9b51d07e19a1e629f1efa70d8376ab52f0bfb91f1fcc
+DIST AdbeRdr9.5.5-1_i486linux_enu.tar.bz2 57127348 SHA256 ee0ea9c65b38abd40ec7c92654e767dc138757f02aef5ae92f74e2dc75ac6540 SHA512 0d60f9c0248432445fb0e6ccbc6d7841ed3e63dad61765436c53098b15c2ede77f1dd6369b04004cec020c20df395f195c4aaf464a6e2761e57a9e9ea0cb5361 WHIRLPOOL 16ae019b3f1bc5b54a31af53e14788223ceed06483563dd4f5fdd7cd7356496188bbd95b04582dd768c4853998706c41cbb5c2b7a9dda99133e712e04b4dba59
 EBUILD acroread-9.5.4.ebuild 6303 SHA256 ff906ae56d19cfc7d1c2946f09a9295382195dac454eb96ec5383ba7dbe51f35 SHA512 211b86ed6b3d6d0ab92e7eef1f725c78b26d71ccf2c6455805a9ecd3a73247c33e6a00f83df64027640985eb61451e73d860d69b5ba967d8a3e48930efde7354 WHIRLPOOL ea5aa6a7826685a1ec08cfe964312abfb05d9505091a21ac7307504434d35ed2bf6a39e612c18705446abb74217a5773e98911c052bc664c90b5f6dbbb222084
-MISC ChangeLog 32408 SHA256 f22bc723727ac534fe0ac62acd7152beb15c747ea6b3afd248f92177595008c4 SHA512 0f2184fc6604edd9ea3c4286e0cf1d0e6223169fef7875d9a9cc6acca28c20832931e742ebb61098b01b771578cf1f98eda1ca994e63d13047f7a8f7c771058e WHIRLPOOL e30cc7f2e487649086b7a82ce6bb8dbbe29f461def647fcd3918a2d059e9711a3ad3550a4a3170b777b59e4fe8baee7d08b83c5ddb5ac1e5b099185967a11b80
+EBUILD acroread-9.5.5.ebuild 6308 SHA256 f86b9f58e864c6cc859f9dc75836d3f69f985604a1aa25f4f34cb3db3da22074 SHA512 268da3676dbdeded2f93606e388235a5d6ce3fa89fd6468e07516b39a1a326ebaaaec02048248733605701ff755cc3368d1771af375d54dca7263485b5410526 WHIRLPOOL d703385257f21fe97256813ef7228e464bf7f017bd56359b1b348945cc67cd56fb1ba7871fb21fb797eda0797f6fcd704fbccc3585c53b5207c9a3a70a10a782
+MISC ChangeLog 32553 SHA256 c29e72dec275fae33e05c56e59703e0544276abd85d71209e23c1140678f4e4d SHA512 2383403515b6834b3f1c89a3b1dfab2c500e912b43e4028509598dc45cd3eb7c928bd1402132c90ec610a9352890630cef4d3d7909dde8d42b7323a3056d912b WHIRLPOOL 2af2d6569f0130f4e307de539cb1a928f505642907091eeeafdf53671bc019290e101ae4ef519126e561a2562ad7cb80f01d24a8d79fdd712bccb7e5ca1d7962
 MISC metadata.xml 257 SHA256 bda1e4362fabecfeafa40683399ef5580cf9f9c79aa097dc8695c9966393198d SHA512 b1571019d9d9a1e6161c01fe6720dc582c2e68eb9eea867734c2950a5068c267ba52b0bcbe62317f623bab3d8f5e2a01d44740236dd4eb132a8ff6aeab59f010 WHIRLPOOL 062e0479dcf0c2c4ec813519d595e256843f6cdc6658d9f6020966842eb4a1757dbe7d083d44762c8a5ad1714bd9823e8e7d3ce54ee4f5e2a778ccccb3d03009
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRtPyKAAoJELEHsLL7fEFW4TMQAMZJ7EcoaWBPpg8Oo5Px83RK
-9cLfxRUdK4BT0EQkXyDdJ/SuABKHJ68BY4S/dACo7z8hgt2Il3NwRAtHXQA6ECc2
-HKnO4ql9hGJ83zk3NVaOZMUFyo0UbvOTNxgE0eZ9X0mh3WHhKk4eAb/7uMt7e8sP
-UYefiqDZRpEU5hy50nHd2DbVkKgzu0kK7MvXBfvBkWYnki02qHk4B8aF4wNr7iiU
-Xc27xZ0tFM7HxFBRyRwZTCcsRWMzbSw8ab0fABi3r42I9ht3DkSqiNJRbMT3JCHn
-dHvYTJwo7ZlA5h4nIgXjrg0DiVdJCOTUOUyVquHJEyUfRcDllHhkuM2G9bXtpN1q
-I5jJ3GrvA9Qke6UZ42fiS19gRJtj3jHTLloJ+7nutC0Ud3TtxQo7xp3kiqz8VccE
-npUM8lujM3d9L/X5MaoADl0vt+zHAgSem8IqpPBA2YTJjGDOhWOf5aoWB/R/lNOP
-nXEKDjtHrckQ08WjS8DTuQEztDJESIxk7oeAJY8Cxlbq4w6s8+C4eQcJy86weo5v
-ShI8M2ohVeQRV3cgV1BOF7r7uvU+8CXdzoPZ6Xdk49MSiAGWw+kkq9MWcs6IrHfd
-tEPfX14NqLIf91hQlq4MsioEVtCKemG8SL8JlUqc2WUtT6D/XcOeJpxIKlXrIUrN
-iBvAuiXFw6yj3+Wo/and
-=5+1M
------END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.5.5.ebuild b/app-text/acroread/acroread-9.5.5.ebuild
new file mode 100644
index 000000000000..0c414752ad76
--- /dev/null
+++ b/app-text/acroread/acroread-9.5.5.ebuild
@@ -0,0 +1,198 @@
+# 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.5.ebuild,v 1.1 2013/07/07 17:03:45 dilfridge 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/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}"
+	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 && 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
+}