Don't create bogus file (#412051), fix .desktop file (#476096 and #543592)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 76 insertions, 66 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 8c35403b8f76..d02a063b410f 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.206 2014/12/16 13:25:37 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.207 2015/05/09 12:32:16 pacho Exp $
+
+*acroread-9.5.5-r3 (09 May 2015)
+
+  09 May 2015; Pacho Ramos <pacho@gentoo.org> +acroread-9.5.5-r3.ebuild,
+  -acroread-9.5.5.ebuild:
+  Don't create bogus file (#412051), fix .desktop file (#476096 and #543592)
 
   16 Dec 2014; Pacho Ramos <pacho@gentoo.org> acroread-9.5.5-r2.ebuild:
   amd64/x86 stable, bug #528596
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 599a572008df..c5a77806e9ae 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -4,13 +4,13 @@ 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-r2.ebuild 7409 SHA256 36ebc712cd72a05ae91a89631ff5bd5f6a4e7041a00318983c7efdd45c5d70bf SHA512 e45c42d7b41ab28622dbce1f441f9717ccc968120cdf27b161989d79c1ab6cff3c471e7806602f93c67beb8cecefa98502280b6f160cfd25b9150a3a8cf2741e WHIRLPOOL 6b734392d83e4890f23b5ff4a7036de25c34e4f24bf2d5d5e8d126033b64a0598189a04e46054ddfe635fc5ac66609769ab55b7a1bb3dc57480355e46c043edd
-EBUILD acroread-9.5.5.ebuild 6781 SHA256 3dcc0c8cd8e85369f82bd3e98f856b11314a4f18f7c682b2ec908bd37711fa2f SHA512 fa2b4433715a95d4ebbc91069ed43e53869e466943a5f79e9727a1155d172d395a861bcc741d95c7b9519588cdcac86dd26f4bb23d3f04138244967afb54bf0e WHIRLPOOL 897518f14985d96603f278ec917e3ee267cd31a063cbe3595219ffac730f62db4728a3b280d39441489c981f22741ae0a92c0541b01a3769cbb5d014391e6df2
-MISC ChangeLog 33998 SHA256 90c09e370181c6d81ebd7db21dbc0f1831d048dba3434341486e0abd7eb29c8b SHA512 bc570e6a6b45614e9ab87412f1a305d1c7ae98a869955bab166ba9730c746bdfc97cfe2d6fe94c417943a7a4a2b476fa125453f1759efec7a1481c519ddb367c WHIRLPOOL 7216023702cb932dab99a02f882569803f498ac23d40f166d76190c7fb0928d1c663cc7f91d8146a3aee7db6b302ca996477c847641f8bf4a614e1b9c50282d1
+EBUILD acroread-9.5.5-r3.ebuild 7046 SHA256 30ec19993c356ada04dda02c8ea97f01e73bc6ec370b64ba278523c17e047be2 SHA512 c0b1dfbdfe859469142ed77db2ccd473d2900571c8228062df34ab349e95e3bb753ef37af6616e58d45d866c63b519f23e8f8ed22d910fdaa0946fde2f88265c WHIRLPOOL 0c52adecd4913a16e98c6e24b6476574eb829073663c12021119fb33302ae716029d08bdc45ca767c35da79ce504d7f07927a7a896c82af6307f884cc3a89858
+MISC ChangeLog 34209 SHA256 700d8f163ba0e4036527cb8e37ce3c571c266ae9fa3697481582f32073dcfee0 SHA512 65876a5374e25dbb42d5b137a3cbbe1c0e69aa833e980b792bf8e3ad2db7345acb8b76792a248104dfdf7c95a31797fb2bf051d0723acbc499c192feec88419e WHIRLPOOL 08284577bc9c1cd01f48ca651af4692778fb76cce79324f0f435de2fb9e436b07506a7b77cb5c7f94270633aa20195be65ec39927a64ca03d1caf9d965834d53
 MISC metadata.xml 257 SHA256 bda1e4362fabecfeafa40683399ef5580cf9f9c79aa097dc8695c9966393198d SHA512 b1571019d9d9a1e6161c01fe6720dc582c2e68eb9eea867734c2950a5068c267ba52b0bcbe62317f623bab3d8f5e2a01d44740236dd4eb132a8ff6aeab59f010 WHIRLPOOL 062e0479dcf0c2c4ec813519d595e256843f6cdc6658d9f6020966842eb4a1757dbe7d083d44762c8a5ad1714bd9823e8e7d3ce54ee4f5e2a778ccccb3d03009
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSQMtQACgkQCaWpQKGI+9S3zQCfd4FuaDZ+hQyCBGg7is4x/gRC
-LU4Ani7Cd9kz472dBnZEiXHhkGswKquy
-=5Bcl
+iEYEAREIAAYFAlVN/lEACgkQCaWpQKGI+9SR/QCghXgIq88eMMqX/aYTEZ7X/AtA
+2KcAoIZ7BoFTn0D7WtBYhMYeyWvgEa4e
+=DtDZ
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.5.5.ebuild b/app-text/acroread/acroread-9.5.5-r3.ebuild
index 87fde13f6aee..4935d169f522 100644
--- a/app-text/acroread/acroread-9.5.5.ebuild
+++ b/app-text/acroread/acroread-9.5.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.7 2014/06/18 19:03:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5-r3.ebuild,v 1.1 2015/05/09 12:32:16 pacho Exp $
 
 EAPI=5
 
@@ -11,51 +11,55 @@ SRC_URI="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}/enu/AdbeRdr
 HOMEPAGE="http://www.adobe.com/products/reader/"
 
 LICENSE="Adobe"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="cups html ldap nsplugin"
+IUSE="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
-	cups? ( net-print/cups )
-	x86? (
-		=dev-libs/openssl-0.9.8*
-		x11-libs/gtk+:2
-		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
-			)
-		)
+DEPEND=""
+RDEPEND="|| ( (
+	dev-libs/atk[abi_x86_32(-)]
+	dev-libs/glib:2[abi_x86_32(-)]
+	dev-libs/libxml2[abi_x86_32(-)]
+	dev-libs/openssl:0.9.8[abi_x86_32(-)]
+	media-libs/fontconfig[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	>=net-dns/libidn-1.28[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf:2[abi_x86_32(-)]
+	>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/pango[abi_x86_32(-)]
+	|| (
+		>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
+		<x11-libs/pango-1.31[X]
 	)
-	amd64? (
-		|| (
-			app-emulation/emul-linux-x86-gtklibs[-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,abi_x86_32(-)]
-				)
-			)
-		)
+	) (
+		app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	) )
+	nsplugin? ( || (
+		x11-libs/libXt[abi_x86_32(-)]
+		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+	) )
+	ldap? ( || (
+		>=net-nds/openldap-2.4.38-r1[abi_x86_32(-)]
+		app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	) )
+	x86? ( html? (
 		|| (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-			(
-				=dev-libs/openssl-0.9.8*[abi_x86_32(-)]
-				>=net-dns/libidn-1.28[abi_x86_32(-)]
-				ldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)] )
-			)
+			www-client/firefox-bin
+			www-client/firefox
+			www-client/seamonkey-bin
+			www-client/seamonkey
 		)
-	)
+	) )
 	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] )
@@ -123,21 +127,15 @@ src_prepare() {
 
 	# fix erroneous Exec entry in .desktop
 	sed -i \
-		-e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
+		-e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %F/' \
+		-e 's/^Categories=Application;Office;Viewer;X-Red-Hat-Base;/Categories=Office;Viewer;/' \
+		-e 's/^Caption=/X-Caption=/' \
 		"${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
+	sed -i 's#C:\\nppdf32Log\\debuglog\.txt#/dev/null\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00#g' \
+		Adobe/Reader9/Browser/intellinux/nppdf.so || die
 }
 
 src_install() {
@@ -165,19 +163,20 @@ src_install() {
 	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
+		inst_plugin /opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	else
+		rm -v "${ED}"/opt/Adobe/Reader9/Browser/intellinux/nppdf.so
 	fi
 
 	dodir /opt/bin
 	dosym /opt/${LAUNCHER} /opt/bin/${LAUNCHER/*bin\/}
 
+	# NOTE -- this is likely old and broken and should be removed...
 	# 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
+		for lib in /opt/{seamonkey,firefox} /usr/lib/{seamonkey,firefox,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"
@@ -200,12 +199,17 @@ pkg_postinst () {
 		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
+	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