diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-16 21:28:50 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-16 21:28:50 +0000 |
| commit | 47b68ae96ffdb7886cd159295091753e08aa9451 (patch) | |
| tree | 37b9415f296c7269125661c8e4efbbca8ee8b63e /app-editors | |
| parent | Add mpi USE, see bug #511456 (diff) | |
| download | historical-47b68ae96ffdb7886cd159295091753e08aa9451.tar.gz historical-47b68ae96ffdb7886cd159295091753e08aa9451.tar.bz2 historical-47b68ae96ffdb7886cd159295091753e08aa9451.zip | |
Disallow emul-linux-x86-*[abi_x86_32] from satisfying the deps to help PM understand that we are using the multilib package then.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs/Manifest | 24 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r10.ebuild | 6 |
3 files changed, 26 insertions, 10 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 3222d1e3d70e..9d6b37b00ef4 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.635 2014/06/08 12:26:29 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.636 2014/06/16 21:28:47 mgorny Exp $ + + 16 Jun 2014; Michał Górny <mgorny@gentoo.org> emacs-18.59-r10.ebuild: + Disallow emul-linux-x86-*[abi_x86_32] from satisfying the deps to help PM + understand that we are using the multilib package then. 08 Jun 2014; Jeroen Roovers <jer@gentoo.org> emacs-23.4-r11.ebuild: Stable for HPPA (bug #512692). diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index b1c0c5c7ba9b..74b829a825d1 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -9,16 +9,28 @@ DIST emacs-23.4-patches-14.tar.xz 12088 SHA256 c46406a32b53d6c8b68c007f8d990ceb1 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b DIST emacs-24.3-patches-7.tar.xz 6484 SHA256 167a004b3b528dada8f68d28ce98cfbf1f23a1e00e52d7b23e14352178e5eab7 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 WHIRLPOOL bb68a6874e682afe58fe4cdf60695bc7b8d763afd15ba40ffda3156e80a6cad318e969fed6f22cb6e484ffdc29daa1b6b64873bf6cf73de28cfa711172046138 DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8 -EBUILD emacs-18.59-r10.ebuild 4381 SHA256 7aff3e288a550a347d7257a2f1f33290f0a148a7d5df46c3a71b91e9d58e3059 SHA512 32dd6fce795b6eb999f76d2a8896f4e8af2850314f969fe5a9885f1adf7e9b0b7bbd879789491f99869c2a84aebddea7889804b3593258094625c06ad35a53c5 WHIRLPOOL 1a737882a91136a6093d30a6a6ffc28ceface46d91436ee7ed202e92626f23c6ee38b9c4cc6bf0951c4ec55a362c0305ba682c7e08086a68d2e46960c93fd920 +EBUILD emacs-18.59-r10.ebuild 4398 SHA256 e4f7e094ac9a8b1a830c94e5ec3d42dec880b0ac5ad672e0802c405f7a9c1155 SHA512 f27bb4f47adbd21327b3d3b1d065ceb3fedc78dd76bd6be1de5fa91b9575c18d770dd3641cac61f4daca3aa242f7219112df4bd15eba5800ebcda8dab7b89092 WHIRLPOOL 9e642c8f1bdb380cbcf537032ce26adcafd2cd5941ff35a617d3910bee0fd3dd1296e00cc6196edb6aafdbfa9d9ffa06ac2154e799261d69bfe0265b6fbb6cb7 EBUILD emacs-23.4-r10.ebuild 11191 SHA256 fd789d021fd5a6c5aafcd8d775e38e724c161aa7a00144c29404689196464c11 SHA512 f4b68c28e3248990b989e3e34c36e36aa91d2796022d6faf9ba14499363705adb711ad2faa2964c157fd7ac3551289112c25886e0a12aae08d1b3c8a9d9dcaf0 WHIRLPOOL 15d5face8631b802b07e65666f54718ceedcb07ce1796174bc692b01a418023a3e41587c6e0792374d1fb6ae317c186dd881de7c6397ee5ef6c0dd624c3f1339 EBUILD emacs-23.4-r11.ebuild 11183 SHA256 9f3bfed868fc928315db9d1f8a688ccb2285be001dc67c7469baeaee952c5d37 SHA512 0a5b9b115feec7591819a873c4b9705feb4df269c1736c02128ea721a9258b024a372d28693e94de5d62331c592bbfd35c45dc7e276cea3c8393885fa655b70c WHIRLPOOL f768b319866be45b56590329c15eefcaf893732f36f9a35d013b448e7b96800203982d7e8530f6cd547b07ba4230ef7df492f15bf2c0379177345d8d68658ece EBUILD emacs-24.3-r6.ebuild 11077 SHA256 64ddd4f5dd1034033c43654eaa8f07f8864dcb560ba8f4b635ba6dd938494e4f SHA512 4e61f865046ab4a152f96809b11c648d96ce79ae4bc95fb97c6d743e677bde648775abb612b28f32312dbdba444f655441dc3320b601315c939ed7b8c5adb64c WHIRLPOOL 18607e47889e25cedfc6347ac78d131a58852f4b011aa73eca87283dfb86b4c5bfb99aed7d705bda04494cdc5f84bdf359783c7c697157895441f0521284068d -MISC ChangeLog 86839 SHA256 3ab4d43665e28d3c1cf55fdd7675d3845d8782ae6733b1370fed9c5f1b03adbb SHA512 12b307a393c469cd17f056f2f2c1f8d6a93e7a19b3cf22af76e53d081eddc19b6f4e9218cd51ba65c00f27de4f44502218b52c53bb8c28c4806b30adf8399433 WHIRLPOOL b35d3d9211ea91bd078742a711c0f981bb8bf5cf29c2fadb2a1b50104ba124ee61c0332798d419d0ad047c7ae8c63fd6ee39671bca097af6d4558c0056731612 +MISC ChangeLog 87051 SHA256 5ddafe259c8699ffb2c8e8133f0a36a5d3374f4b219fe79c6123a30fc7b92385 SHA512 a82964136b01079a737839f82334d7a93eb9b36e6197b8e85edba4d298f384b177c18820502ca0fde00b0751728b5e34dcf5665a99e4783efcaad7fdf3342df5 WHIRLPOOL 0a508958cce0f18a47fffe02bdb778154eb4b53be87887f73b393f2f511f34e0af0ffb9ea078a8bf2cb0742bc2c880e82acd427aebb50f10fbf25f82d2978ad3 MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlOUVnYACgkQVWmRsqeSphNZ9wCggJrvfr/28KPlLfzgdMz3U77j -5MAAmwWNHeN2vvtEd+Q6N5vcfiAuzyzh -=wm4L +iQJ8BAEBCABmBQJTn2GRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgUYP/2LpWnjfYqU3kb/HZs+t1H4v +1/NV9Dd/blWFFgZyHSKl4XZy3AB5mc1KWAdJ1Jq4QgPQosbRkcHtLhGz+PsjcGCF +wBrQarzFT56tqkGpc8f/CgIRj0ij2oS5AlyzTTlpuIug/tG8ViwXIrYE1ZN1+OMh +Mv/0OXl/R99U0n6owJTh3NDbgtPhcmJf9hZksefUfVGx0S+fti5eDqZLc+TfsqsH +W5en2z5xFJNk7qrs8ibkXWqYy5nnNSBL5MfhSg96rNzKFQclRCdNuatX42xgVnzF +m8cUL5c8whLFmEki+/E1NxnmRla2CNfgQXJOmrV4NXvMd1WptSv75VrbPLc/YPoq +hdplvgDDvAXBQg8scNLytC1+CAsqUAgW8X0tXspaOMSK3v3yj6wFzMsBydF9kgVt +lcrmItb4wNgny/JK9dC59F3fIKjMc5wmE6DMscHzrSR/feylnKvr+nxHEZhE6Rgo +nQUU1E9TU2AGJvS3QhYglYZCERttQQbtVbJ0ac6CgRAnS4B3zvJ+TSdCQmG7cL8R +XYaPL+LOOv58+9geO5cFztSF5niM+qGjuiZXUG0dVZWVRpIyTGGpQTFdfYPcXVe3 +J0Tw7H+9LJEyRoB/SdEKee638fPbzUIQg6uQ2UBIi1NFeJYIiRI2sHWJccL4+RsJ +gfHPQKAqbV2XjvteI3fp +=YUQr -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-18.59-r10.ebuild b/app-editors/emacs/emacs-18.59-r10.ebuild index 70e67b84cf26..1f5b9f0d0d69 100644 --- a/app-editors/emacs/emacs-18.59-r10.ebuild +++ b/app-editors/emacs/emacs-18.59-r10.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-editors/emacs/emacs-18.59-r10.ebuild,v 1.2 2014/05/16 06:47:20 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v 1.3 2014/06/16 21:28:47 mgorny Exp $ EAPI=5 @@ -24,8 +24,8 @@ RDEPEND="sys-libs/ncurses sys-libs/ncurses[abi_x86_x32(-)?] !abi_x86_x32? ( || ( - sys-libs/ncurses[abi_x86_32(-)?] - app-emulation/emul-linux-x86-baselibs[development] + sys-libs/ncurses[abi_x86_32(-)] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] ) ) )" |