mgorny      14/05/27 13:36:01

  Modified:             acroread-9.5.5.ebuild ChangeLog
  Log:
  Support fulfilling the dependencies using multilib packages, bug #490156.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.5                  app-text/acroread/acroread-9.5.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild?r1=1.4&r2=1.5

Index: acroread-9.5.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- acroread-9.5.5.ebuild       13 Jul 2013 19:07:04 -0000      1.4
+++ acroread-9.5.5.ebuild       27 May 2014 13:36:01 -0000      1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.ebuild,v 
1.4 2013/07/13 19:07:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild,v 
1.5 2014/05/27 13:36:01 mgorny Exp $
 
 EAPI=5
 
@@ -21,11 +21,10 @@
 
 DEPEND="dev-util/bsdiff"
 RDEPEND="media-libs/fontconfig
-       x86? ( =dev-libs/openssl-0.9.8* )
        cups? ( net-print/cups )
        x86? (
+               =dev-libs/openssl-0.9.8*
                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 )
@@ -38,8 +37,21 @@
                )
        )
        amd64? (
-               app-emulation/emul-linux-x86-gtklibs
-               app-emulation/emul-linux-x86-baselibs
+               || (
+                       app-emulation/emul-linux-x86-gtklibs
+                       (
+                               x11-libs/gtk+:2[abi_x86_32(-)]
+                               || ( x11-libs/pangox-compat[abi_x86_32(-)] 
<x11-libs/pango-1.31[X,abi_x86_32(-)] )
+                       )
+               )
+               || (
+                       app-emulation/emul-linux-x86-baselibs
+                       (
+                               =dev-libs/openssl-0.9.8*[abi_x86_32(-)]
+                               net-dns/libidn[abi_x86_32(-)]
+                               ldap? ( net-nds/openldap[abi_x86_32(-)] )
+                       )
+               )
        )
        linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
        linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )



1.201                app-text/acroread/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/ChangeLog?rev=1.201&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/ChangeLog?rev=1.201&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/ChangeLog?r1=1.200&r2=1.201

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- ChangeLog   13 Jul 2013 19:07:04 -0000      1.200
+++ ChangeLog   27 May 2014 13:36:01 -0000      1.201
@@ -1,6 +1,9 @@
 # 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.200 
2013/07/13 19:07:04 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.201 
2014/05/27 13:36:01 mgorny Exp $
+
+  27 May 2014; Michał Górny <mgo...@gentoo.org> acroread-9.5.5.ebuild:
+  Support fulfilling the dependencies using multilib packages, bug #490156.
 
   13 Jul 2013; Zac Medico <zmed...@gentoo.org> acroread-9.5.5.ebuild:
   Lowercase tar extension required for unpack, bug 476734.




Reply via email to