summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-05-27 13:36:08 +0000
committerMichał Górny <mgorny@gentoo.org>2014-05-27 13:36:08 +0000
commitb2d3709b4b6068e7ad16dfa817ed1a30e7769cb8 (patch)
tree0a6103f6aca351e7b53a7bef8b19c4e199ab1eb2 /app-text/acroread
parentVersion bump to 1.4.6. Drop older. Add idn useflag. Thanks to Ondrej Sury for... (diff)
downloadhistorical-b2d3709b4b6068e7ad16dfa817ed1a30e7769cb8.tar.gz
historical-b2d3709b4b6068e7ad16dfa817ed1a30e7769cb8.tar.bz2
historical-b2d3709b4b6068e7ad16dfa817ed1a30e7769cb8.zip
Support fulfilling the dependencies using multilib packages, bug #490156.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'app-text/acroread')
-rw-r--r--app-text/acroread/ChangeLog7
-rw-r--r--app-text/acroread/Manifest24
-rw-r--r--app-text/acroread/acroread-9.5.5.ebuild24
3 files changed, 41 insertions, 14 deletions
diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index ffc772926f8f..4fb2f886156e 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -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 <mgorny@gentoo.org> acroread-9.5.5.ebuild:
+ Support fulfilling the dependencies using multilib packages, bug #490156.
13 Jul 2013; Zac Medico <zmedico@gentoo.org> acroread-9.5.5.ebuild:
Lowercase tar extension required for unpack, bug 476734.
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 6ffe2af2562c..e10deb160152 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -3,13 +3,25 @@ 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.ebuild 6437 SHA256 f0866e32c8390f9073a4143beb98c86d5eeffe11880bd48732070211fe8dc8b9 SHA512 26c416f482335285a1909431c920292005f661c90ad4793f50d51de4ae1c123d6284ee76d207d80650b17a0976e2fc56886f5d397550ebbc1c5c9ee4a139a24b WHIRLPOOL b85694c3f6278c1e32482cdecfc406c66811f1fe6866e988d078a2e113232143c2080e23135bd91b1f34f4179fa23957764e1ba4ca2b962931169de1ed4cc540
-MISC ChangeLog 32994 SHA256 5183df9a0ae23ba3acc2d8f9d5fec4bd699253821aef96d50b9ed627f367e3fe SHA512 e358039906403a7c16c1b57766f609f9c4785f096513056d7dd7ac8e54bce8a3bd9bdac2848339d5c2c7ca4944034cbff1176d3e198653c7c903ac97e75c562d WHIRLPOOL a9fb8da07bfe1c9a42f713e3f00950140c10fd976e7f9f6b4f69d5a969bf7ae36c01d654646c8fba08e0c373f14b80bcc6958b438f3fbe3fcf4860ac9af546f6
+EBUILD acroread-9.5.5.ebuild 6698 SHA256 2ed7738ba8fcce5f8d251815200666d36e06c1c9cc8223bd7f1066049b9d8be9 SHA512 cbf8340481e611e6675343cd79d5cf0170e98cfe9c496a1a87b094d51275fd5babbb8f9b65f454949f172a935308db260b140926b1b9c2da234c35e211fdd85f WHIRLPOOL 9b21673d51bb222ea7aaf14224a8955921a28cd7bab2865045e63426f35ba6c4350ca6b5dd4a4bce253fd630fd1569258c00fa362bcf3370ae61056a7db7103f
+MISC ChangeLog 33143 SHA256 9eba83fcec3bcaed6e8a4638399fc9e30cfe041e522c06766a9af69bbe24fc28 SHA512 97b874f9712576691ef655cea6e05fc11d9760d8b924d65b589b7dad76a241a6c919f12b6106fa5931e3acbb0d5805f22e257b6ef80180b1eddca16e2f6c87b1 WHIRLPOOL 7b2f34c2244e94535043ab99affca5dff5f20edbc4dfbcb601b8f82d3812fe437070fcdacb7aed9ffb157e75669df212096ca85552027231e4389092798e5f46
MISC metadata.xml 257 SHA256 bda1e4362fabecfeafa40683399ef5580cf9f9c79aa097dc8695c9966393198d SHA512 b1571019d9d9a1e6161c01fe6720dc582c2e68eb9eea867734c2950a5068c267ba52b0bcbe62317f623bab3d8f5e2a01d44740236dd4eb132a8ff6aeab59f010 WHIRLPOOL 062e0479dcf0c2c4ec813519d595e256843f6cdc6658d9f6020966842eb4a1757dbe7d083d44762c8a5ad1714bd9823e8e7d3ce54ee4f5e2a778ccccb3d03009
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlHhpVkACgkQ/ejvha5XGaM8MwCgmMXbvtu7cVJoQhbTaOBAk3Xi
-DZEAoM/VLO9Z0GOAQqhKCkeSdcpPNYo/
-=Vr8z
+iQJ8BAEBCABmBQJThJTHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqi0QAKQzNmLMfEwdT4ORWDtSjPSN
+mUEyQvcYGP8hhhsv2wopUIXYKkIMFLf03aROtKtZuiFXytxpMriPB+gpPMoVFTkS
+k4F0lXrDDoIKoI2mGC6Gc3+ZQk0bGhq1ljt06yCXPEkw0TANHsL7Uj+fB61FBETu
+ZCcViV4YV6q9pnpFFPtZA1kOLqAscppPu5DhtyqfnVZ20I88XL7+bOwblEZ3YjZg
+Sy8Cn2CMlIgkxKzJaldrR5G/sZ5jaeoAm1iPPR7Wkums4NkSaQUbNF2UnJEZYMfx
+ytiqaN7OtAXF45CJ4cwbX80f3xivkU4TFIZ0lZuZq4wSMlfbpuYitsVnp/wJbmNL
+K2BB5Gy3DYIVBKk29GzjRyTcpmfVkTxRQltf7GkXXolj7C509FlrIQCsi65bl4qf
+nl1geSK5Ck0qzmC8O7SSvHqokGNR1dfqb2+VNOYS0eopSuo6H0Qd29+NIXQJPqbu
+ECI+/BeQNKmKlBfi2c5UefnhvH94Gl1YDoJg4YdxqAWQmg4c0GWwhfOgNzlT2osi
+bkkao2VbKQO5hvFvvMgsKAEWkQVgdiMGWxFXRaKBXr6vwKOoHExj63KtF58prWlp
+H/Aq9H5DMan29hZk+KWmw7fWKdrPQT8iF8ihiUBtWUe+UuhYcOupn9X7PTF3odXq
+h4vy2gR92HG9TLczp+ht
+=1GTA
-----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.5.5.ebuild b/app-text/acroread/acroread-9.5.5.ebuild
index f03fb355c1bf..19595e3ba622 100644
--- a/app-text/acroread/acroread-9.5.5.ebuild
+++ b/app-text/acroread/acroread-9.5.5.ebuild
@@ -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 @@ RESTRICT="strip mirror"
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 @@ RDEPEND="media-libs/fontconfig
)
)
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] )