diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-15 14:06:17 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-15 14:06:17 +0000 |
| commit | a48f1f2b4a330c68170173f782c1b90c7635daf5 (patch) | |
| tree | f95f448aac53cfc97c1c546a37ec8afa88f71f5c | |
| parent | Drop old. (diff) | |
| download | historical-a48f1f2b4a330c68170173f782c1b90c7635daf5.tar.gz historical-a48f1f2b4a330c68170173f782c1b90c7635daf5.tar.bz2 historical-a48f1f2b4a330c68170173f782c1b90c7635daf5.zip | |
Disallow mixing of emul-linux-x86 with multilib dependencies, since all dependencies are unmasked now.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
| -rw-r--r-- | app-text/acroread/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/acroread/Manifest | 34 | ||||
| -rw-r--r-- | app-text/acroread/acroread-9.5.5.ebuild | 11 |
3 files changed, 29 insertions, 22 deletions
diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 4fb2f886156e..45823472cd21 100644 --- a/app-text/acroread/ChangeLog +++ b/app-text/acroread/ChangeLog @@ -1,6 +1,10 @@ # 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.201 2014/05/27 13:36:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.202 2014/06/15 14:06:15 mgorny Exp $ + + 15 Jun 2014; Michał Górny <mgorny@gentoo.org> acroread-9.5.5.ebuild: + Disallow mixing of emul-linux-x86 with multilib dependencies, since all + dependencies are unmasked now. 27 May 2014; Michał Górny <mgorny@gentoo.org> acroread-9.5.5.ebuild: Support fulfilling the dependencies using multilib packages, bug #490156. diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest index e10deb160152..76f1332f2ebd 100644 --- a/app-text/acroread/Manifest +++ b/app-text/acroread/Manifest @@ -3,25 +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 6698 SHA256 2ed7738ba8fcce5f8d251815200666d36e06c1c9cc8223bd7f1066049b9d8be9 SHA512 cbf8340481e611e6675343cd79d5cf0170e98cfe9c496a1a87b094d51275fd5babbb8f9b65f454949f172a935308db260b140926b1b9c2da234c35e211fdd85f WHIRLPOOL 9b21673d51bb222ea7aaf14224a8955921a28cd7bab2865045e63426f35ba6c4350ca6b5dd4a4bce253fd630fd1569258c00fa362bcf3370ae61056a7db7103f -MISC ChangeLog 33143 SHA256 9eba83fcec3bcaed6e8a4638399fc9e30cfe041e522c06766a9af69bbe24fc28 SHA512 97b874f9712576691ef655cea6e05fc11d9760d8b924d65b589b7dad76a241a6c919f12b6106fa5931e3acbb0d5805f22e257b6ef80180b1eddca16e2f6c87b1 WHIRLPOOL 7b2f34c2244e94535043ab99affca5dff5f20edbc4dfbcb601b8f82d3812fe437070fcdacb7aed9ffb157e75669df212096ca85552027231e4389092798e5f46 +EBUILD acroread-9.5.5.ebuild 6744 SHA256 555864d78f3006003f4c82bd09e8e6b1272476d9d15f5a9b5fd52b6716cb6dd0 SHA512 e02075c3ddbda8bb59beb5d0a29ea934bc2ca5dc5f49f91804489c6e908674de8c9d282a19a5a2df70cb98c871cea984b14048fffea55cccb4a7bb67f398de42 WHIRLPOOL 2786a7c30c9c6b865be41aae08947f9fc75f02e45b2acd4a17eecdd3ca3dbe12c2cd5a8fb5ff65134795e4542e8d0d616f0049387f73ed6708962725cda066d0 +MISC ChangeLog 33324 SHA256 2b7ff5f3069f2e4b5c900d0aa966a4d9a700ac1ec817f9903fe357e8d5096de3 SHA512 d838d47627140909cc825cc846c04bc4641010dc429c6521065f1beb8a6fae74e7931124539b67023ef4147c4a7c6bb9a2f1e7b1e4e964cc98f0b19dd7db4fd0 WHIRLPOOL 270444a869ad2e337b2ccb20285750d964d6d1bb03c899f5e64e7feb94c65aea7af5148395aaa1b678b8962ba03412eb02c4b28026fd0dfbe6a2fb1a206d3ee3 MISC metadata.xml 257 SHA256 bda1e4362fabecfeafa40683399ef5580cf9f9c79aa097dc8695c9966393198d SHA512 b1571019d9d9a1e6161c01fe6720dc582c2e68eb9eea867734c2950a5068c267ba52b0bcbe62317f623bab3d8f5e2a01d44740236dd4eb132a8ff6aeab59f010 WHIRLPOOL 062e0479dcf0c2c4ec813519d595e256843f6cdc6658d9f6020966842eb4a1757dbe7d083d44762c8a5ad1714bd9823e8e7d3ce54ee4f5e2a778ccccb3d03009 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQJ8BAEBCABmBQJThJTHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTnahYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w 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 +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLK4QAN+rHNEHR4mjlmnOMVDbXgTe +/Qr+ho1uNz725GHRNyzZnbicHcown9sj2kC0nYGIb4APhUPBTp2EmWzItUUODd8B +4C305ZGqcNCW11Al9RMb//IrfNCYMf4WKIH7aC0kzhdS+xUjmPJ5heVjOsCOG217 +jAEl7qF0aIGQ6TOPJzKOXvlqhd2FL/xfjhwXXD33vf8hAwXxhMc5h/KYvobpRx9H +1/9CPjUN0L+a3NOzU9NlGdeKRpCyvF7b0wOlO6tw0uwohvGlWfZZKxqCiKCaowTF +Za9UtrIiG///tbnXMHQlJD7Ki4gfHrql/aDIvkdgqOtiHKl6e5W287SonCEiMpcQ +/1vUuFp+G64kLmJR8IPb6xuoazn0gVXdDUYvfKJ54su7Q/JtSLI/2q4pKIA/hYrQ +gOCsFTsq5Fjr+aL2Q/Ko6qXNCFUtEYHc58ref8DRd/pY3OiVMhFVdbqWJAxWYtog +9pXjuIOp0p0aVAKGyXqHGUU4ft1jyXSTfC36dJxRxvlnkdgTwWLLDpw9qqpMBnl4 +Q2ak6xz4qU4YfCtf5netikf75Yi0Bv+QCI8PqqkPQzHS+TPg3E1j2ykI4UdBO+dr +/m+O//rEpgeFKh3KHFBlpyiUDxhl8Wv8bUBGLp9h5P9GkycT5tHncudwpaNEyQgY +ixTTCOLpDyRMC0n0Xaic +=Hd7Y -----END PGP SIGNATURE----- diff --git a/app-text/acroread/acroread-9.5.5.ebuild b/app-text/acroread/acroread-9.5.5.ebuild index 19595e3ba622..196f69516ce4 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-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.5 2014/05/27 13:36:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild,v 1.6 2014/06/15 14:06:15 mgorny Exp $ EAPI=5 @@ -38,14 +38,17 @@ RDEPEND="media-libs/fontconfig ) amd64? ( || ( - app-emulation/emul-linux-x86-gtklibs + app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ( x11-libs/gtk+:2[abi_x86_32(-)] - || ( x11-libs/pangox-compat[abi_x86_32(-)] <x11-libs/pango-1.31[X,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 + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ( =dev-libs/openssl-0.9.8*[abi_x86_32(-)] net-dns/libidn[abi_x86_32(-)] |