cleaned up RDEPEND again, added missing deps as per bug 520696

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

3 files changed, 50 insertions, 31 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 47baf1281779..2f810bbf7b4d 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.204 2014/10/22 20:17:07 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.205 2014/11/07 21:54:05 axs Exp $
+
+*acroread-9.5.5-r2 (07 Nov 2014)
+
+  07 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +acroread-9.5.5-r2.ebuild, -acroread-9.5.5-r1.ebuild:
+  cleaned up RDEPEND again, added missing deps as per bug 520696
 
 *acroread-9.5.5-r1 (22 Oct 2014)
 
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index be76f84be2d0..e6b2182ad250 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -3,14 +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-r2.ebuild 7409 SHA256 79f06ca88ee96f447a72ba322ac8095fcef76d183a98a69079f3f1d8253f10ee SHA512 6625d5fd0731a0bacfbd694f835fa580294014ced1e8b82c3833791607cd0936f3bcd4105dd993985ea96007597b0af9e2405894fe53d88afa1c130e5b2fc9ab WHIRLPOOL 588f78578cf6bf045821520bb4bd55af7dac0668bb49abdae3b9bb38065f4d99712042f9d9146d84ec04a91cb99518647c314a7d12fb71572de1ede8080a3240
 EBUILD acroread-9.5.5.ebuild 6781 SHA256 3dcc0c8cd8e85369f82bd3e98f856b11314a4f18f7c682b2ec908bd37711fa2f SHA512 fa2b4433715a95d4ebbc91069ed43e53869e466943a5f79e9727a1155d172d395a861bcc741d95c7b9519588cdcac86dd26f4bb23d3f04138244967afb54bf0e WHIRLPOOL 897518f14985d96603f278ec917e3ee267cd31a063cbe3595219ffac730f62db4728a3b280d39441489c981f22741ae0a92c0541b01a3769cbb5d014391e6df2
-MISC ChangeLog 33678 SHA256 b7182685ebbcb6ce26f4aaf64b926276ed0762e7b917bd854f7a4d85dc26de95 SHA512 88fa1b57bd3a0abcfd2cd84312dd34cc184f118f1230ab0cfe566e42007d56261ffc8c8bb6fc315a71f1ce0dcaa746351acda38a9c8908ed7c7ad4e8762b0e71 WHIRLPOOL ffbc43f2fe48d24e6d661184fbd3cc1be15b3328ccf103ffb89f2cc2a8b0cddcda7ac10bb6907cc21e90f508eb7729e3c043cfe4292cd13464eb10c4c7afd7f6
+MISC ChangeLog 33891 SHA256 f191581c70d81fc04948b244594f9c4169483ef6f9901fa92eca961fa49d14fa SHA512 52a686f3521706c7755f5bf54b17cf21a38fa8fd36bd49fb0a5ce9e30a54dae1fc20b9de8e337eb109d5e063910fc9f074e7ea0c4a9a7670b63a78b504befbea WHIRLPOOL 8802819a43ac1feefe78d256f9fedb653d30659acf292c8471a2cbbd9f88707d7ed4778c94ded2d6d99bdb56b128c44e5991cd315494cc3fcf5b6b60cac2314b
 MISC metadata.xml 257 SHA256 bda1e4362fabecfeafa40683399ef5580cf9f9c79aa097dc8695c9966393198d SHA512 b1571019d9d9a1e6161c01fe6720dc582c2e68eb9eea867734c2950a5068c267ba52b0bcbe62317f623bab3d8f5e2a01d44740236dd4eb132a8ff6aeab59f010 WHIRLPOOL 062e0479dcf0c2c4ec813519d595e256843f6cdc6658d9f6020966842eb4a1757dbe7d083d44762c8a5ad1714bd9823e8e7d3ce54ee4f5e2a778ccccb3d03009
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRIENIACgkQ2ugaI38ACPDAugD/WLz0L0SkwNKzKJF+TVgq4PPo
-jU0HykM0t9sMnbX547YA/Rvd1mX0l7ELkODa+dcojbBCxLD+OmyD7FRSGctf5mWd
-=p4oM
+iF4EAREIAAYFAlRdP4gACgkQ2ugaI38ACPBVyQEApXh0KBF6wT2KnIAnlHqMt81H
+1NvsV2cgcrKaaFEsTN4BALBw7ogYZT7IC8Z4nbinVZ+gO2dGeSXIJAAPQoR9zwfo
+=n1La
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.5.5-r1.ebuild b/app-text/acroread/acroread-9.5.5-r2.ebuild
index f41eb560cd61..7b122efbad8b 100644
--- a/app-text/acroread/acroread-9.5.5-r1.ebuild
+++ b/app-text/acroread/acroread-9.5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5-r2.ebuild,v 1.1 2014/11/07 21:54:05 axs Exp $
 
 EAPI=5
 
@@ -13,39 +13,51 @@ HOMEPAGE="http://www.adobe.com/products/reader/"
 LICENSE="Adobe"
 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"
 
-CORE_RDEPEND="dev-libs/openssl:0.9.8[abi_x86_32(-)]
+DEPEND="dev-util/bsdiff"
+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(-)]
-	ldap? ( >=net-nds/openldap-2.4.38-r1[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] x11-libs/pango[abi_x86_32(-)] )
+		<x11-libs/pango-1.31[X]
 	)
-"
-
-DEPEND="dev-util/bsdiff"
-RDEPEND="media-libs/fontconfig
-	cups? ( net-print/cups )
-	x86? (
-		${CORE_RDEPEND/\[abi_x86_32(-)\]/}
-		html? ( || (
-			www-client/firefox
+	) (
+		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? (
+		|| (
 			www-client/firefox-bin
+			www-client/firefox
+			www-client/seamonkey-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] )
@@ -157,19 +169,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"