Bug #331753 - Only pull in openssl-0.9.8* on x86 since it's provided by app-emulation/emul-linux-x86-baselibs on amd64.

Package-Manager: portage-2.2_rc86_p7/cvs/Linux i686

4 files changed, 16 insertions, 11 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 526807cc8919..631817cd1881 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.154 2010/09/24 03:13:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.155 2010/09/24 08:03:16 zmedico Exp $
+
+  24 Sep 2010; Zac Medico <zmedico@gentoo.org> acroread-9.3.3.ebuild,
+  acroread-9.3.4.ebuild:
+  Bug #331753 - Only pull in openssl-0.9.8* on x86 since it's provided by
+  app-emulation/emul-linux-x86-baselibs on amd64.
 
   24 Sep 2010; Zac Medico <zmedico@gentoo.org> acroread-9.3.3.ebuild,
   acroread-9.3.4.ebuild:
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 4f2eeaa23629..96f9007a155c 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -10,14 +10,14 @@ DIST AdbeRdr9.3.4-1_i486linux_deu.tar.bz2 65859958 RMD160 896417a9722f41fa10e374
 DIST AdbeRdr9.3.4-1_i486linux_enu.tar.bz2 60166581 RMD160 76448b49218f4da2cde3252a3767053acb9d28dd SHA1 9df49f9fdd7f4a9babf37810615d23f84a5daeb9 SHA256 122b3636b0db55acef6c2f68270dd9c1bb43eb79aa061e53d15d779bd26b7fd2
 DIST AdbeRdr9.3.4-1_i486linux_fra.tar.bz2 64533887 RMD160 2b858afed19bccaa188932f543979f127703871f SHA1 3b55192d058ad1fe6753f4d033b0f0faf0fb070d SHA256 8d6c94776f4956f78c72cd9e7b9c66868d6932c50bea98aa50cbecccf0af156d
 DIST AdbeRdr9.3.4-1_i486linux_jpn.tar.bz2 68330257 RMD160 c7642a1429eef1109c0919a2fa0fa6a39c65c979 SHA1 dce03759761af410c65dec8331eb9d235f0726d3 SHA256 6134c1dc304c899a305d70687c84fad1dd57cc3e9e333b6ff4ddd96382db12fd
-EBUILD acroread-9.3.3.ebuild 7386 RMD160 8d5d8911211d30cd4a087990ac3258fb27251c65 SHA1 a8e427d409a7bec4a9d7068b6d16ff6011839b95 SHA256 b05135e313efdd46f7a6f2172a3345bc21b3cdb5dabbcedffadbb5e88630149b
-EBUILD acroread-9.3.4.ebuild 7386 RMD160 6ebddfeb92cba100e3a56c36a9ed7f496860407e SHA1 98ba4d1bcfa943e2742ab31b2bfc975a5b17df37 SHA256 aa45a2c417cd3d5882a1c99dde7dfdb571340f535bdcee6d5b1d60fa6a4357a6
-MISC ChangeLog 26354 RMD160 7c0ed48ac662f83af046937d0d5cf36024adc4b0 SHA1 c537b65a9f08418fbe8e36e5e25b0b6bf7a36155 SHA256 b6ab0bd768faec5ab7646564a62e3ceecedb048a16648be72fa8e74d5a04147a
+EBUILD acroread-9.3.3.ebuild 7395 RMD160 bee13faa980ebb85152ed9d5bf61570b33a5312f SHA1 c8b2230393095f31802dc65c536483cbea8c9d80 SHA256 ed0b1869524cc67b4bdfb5cbd4d1dc376c3b02ed9da7100ac9f4715077a402e4
+EBUILD acroread-9.3.4.ebuild 7395 RMD160 246681a36cdddfa92b1e0c43aae70bf2728c2d0e SHA1 9272b7d22c45777f6da1030f0e879ec3b0a44297 SHA256 3d00ae9e7a36c0f81aff3c663cf099139b405773d3a74f8d768349b804914b25
+MISC ChangeLog 26574 RMD160 cf04efe4f07a0e43ad5983416b537bf90829d3b7 SHA1 15c10449a5c935b2dac5e34efc4776680f40c434 SHA256 8515f21ebde272b09010fc7a47e0ac4b500d8fbbacee82accbfb1d6e65afd0c0
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkycF0EACgkQ/ejvha5XGaPCMgCgy2rKyqcXEtY5fkKcffwiBo8Q
-O6sAni2Z+8B/wbwJc3gvoJ8UGvUEMMsH
-=65wC
+iEYEARECAAYFAkycWzgACgkQ/ejvha5XGaP5bgCfeNpxJGgDu5J5IDTWS1vN9Y5j
+TQ0AoK6hnuqt2+KqAidGGDfHjVeZv8bf
+=vwP3
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.3.3.ebuild b/app-text/acroread/acroread-9.3.3.ebuild
index fb84151f9ef1..e60d989f6bc8 100644
--- a/app-text/acroread/acroread-9.3.3.ebuild
+++ b/app-text/acroread/acroread-9.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.3.3.ebuild,v 1.4 2010/09/24 03:13:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.3.3.ebuild,v 1.5 2010/09/24 08:03:16 zmedico Exp $
 
 inherit eutils gnome2-utils nsplugins
 
@@ -32,7 +32,7 @@ RESTRICT="strip mirror"
 
 # mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
 RDEPEND="media-libs/fontconfig
-	=dev-libs/openssl-0.9.8*
+	x86? ( =dev-libs/openssl-0.9.8* )
 	cups? ( net-print/cups )
 	x86? ( >=x11-libs/gtk+-2.0
 			ldap? ( net-nds/openldap )
diff --git a/app-text/acroread/acroread-9.3.4.ebuild b/app-text/acroread/acroread-9.3.4.ebuild
index 315071807be9..e048d48fdec0 100644
--- a/app-text/acroread/acroread-9.3.4.ebuild
+++ b/app-text/acroread/acroread-9.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.3.4.ebuild,v 1.4 2010/09/24 03:13:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.3.4.ebuild,v 1.5 2010/09/24 08:03:16 zmedico Exp $
 
 inherit eutils gnome2-utils nsplugins
 
@@ -32,7 +32,7 @@ RESTRICT="strip mirror"
 
 # mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
 RDEPEND="media-libs/fontconfig
-	=dev-libs/openssl-0.9.8*
+	x86? ( =dev-libs/openssl-0.9.8* )
 	cups? ( net-print/cups )
 	x86? ( >=x11-libs/gtk+-2.0
 			ldap? ( net-nds/openldap )