From d3e0c0cd62216e05f93fc5c3c53abf4742584f43 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 24 Sep 2010 08:03:16 +0000 Subject: Bug #331753 - Only pull in openssl-0.9.8* on x86 since it's provided by app-emulation/emul-linux-x86-baselibs on amd64. (Portage version: 2.2_rc86_p7/cvs/Linux i686) --- app-text/acroread/ChangeLog | 7 ++++++- app-text/acroread/acroread-9.3.3.ebuild | 4 ++-- app-text/acroread/acroread-9.3.4.ebuild | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'app-text/acroread') 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 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 acroread-9.3.3.ebuild, acroread-9.3.4.ebuild: 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 ) -- cgit v1.2.3-65-gdbad