diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-04-04 18:18:53 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-04-04 18:18:53 +0000 |
| commit | 56f57362a34ac9395418076ad6d16db4e21a187c (patch) | |
| tree | 24f2a6ef0bd042db90f66b1f2b78b594d5817f3c /app-editors/emacs | |
| parent | Install emacs man page under the same name as the binary. Remove old compatib... (diff) | |
| download | historical-56f57362a34ac9395418076ad6d16db4e21a187c.tar.gz historical-56f57362a34ac9395418076ad6d16db4e21a187c.tar.bz2 historical-56f57362a34ac9395418076ad6d16db4e21a187c.zip | |
Restore alternative emul-linux-x86-* dependency for stable candidate.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/Manifest | 22 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r9.ebuild | 9 |
2 files changed, 18 insertions, 13 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index a3f1d189dace..e10cbe52453e 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -17,7 +17,7 @@ DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8 DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1 EBUILD emacs-18.59-r10.ebuild 4309 SHA256 04fbd004ef5f1470000355ca89e461a3d5009b9e63b4fb8e464736471e1cc580 SHA512 b529cb8ed4751b52a68a17acbbe24d7bf7da23a7cd5df81e1fd914e584b8cafbf8e342bb6f2e1f1755c3285b8ee52af1c02cf81a93656c1ae4d3fa4e84958e1f WHIRLPOOL 26917436e6e2a5fccc59d35ea12f6fecf5bfa052cbe0cad7e66757bc537459e368553439f040500f6b7b422771ebd81721986477d91978a7b58e864a4f9e2eca EBUILD emacs-18.59-r8.ebuild 4610 SHA256 b741cf210345fbbcf2f088e98c867e00d4603a26e7897d572b25753a5b07a8a0 SHA512 b53064f7addb20b5aff8990c1efc23e930940725a46759853781eeb2392ef9557139a3b31bbad7ad0928badf9f5623825c15a041e280089eff711c7f10f255cd WHIRLPOOL 550f9c25817349d6196da5c6ad631a1005acaca95120c47a9ef3cdf22a4caea32b452a717f46a7219878fc15a2896e28e95ca0434d01efa413d647187d7b2689 -EBUILD emacs-18.59-r9.ebuild 4777 SHA256 9c2e56f9a9a0ea5f787698b92ed01466da65da1cb83056eca10f93a561c0ae8b SHA512 b2c782b1e8c9a3361a1f95a5b5564560fe50d7cf9b66590e79d7da28c79b4a23591c789d1b6e0834ecd139f9facdeb6f580d32d8a54cf270f0207948a5c97d71 WHIRLPOOL 83b3746cd61105f481cbba82c1e73b890800af410cf87159b2fb06b9abd909860be62d253f4f27cb29647eb192f7c92a0f8689ece12c5ef0a4fbc90b87f94d11 +EBUILD emacs-18.59-r9.ebuild 4844 SHA256 c91b3865809aa488eac2b191398b63f7558a37d7a23f58269c4df8cd9877d02f SHA512 eaeaf7cda744d3378788e90528c4df5134011f1530b70ea89a4f60106a4e1fcf6d6b85e3dbae120868cb7e39f7565a6e10be7a98f233f18f304c20f1b247c605 WHIRLPOOL 9e3f327c45814ec9ea5c2faddd4c217afe4c28f15e41240634f8d3b903d17979506cb71ef489170d0c86f86201f1bc3220746f83a79574f1511fc683a764eb9e EBUILD emacs-21.4-r25.ebuild 5477 SHA256 130d6f9974e47bef70995dfa3b7e1ade026a4015d106c3008c481bfd9cb2403f SHA512 fb271e84cd7f871e59031a988671c0ff6dcf9c14f6f21151f20bdaae73dee5b9f31cb558f723754450a2fe51b835e687b20d7e21fda24026fd2f9dbb10239ebd WHIRLPOOL 8a0f499f08358a1c9bb139b7d71d84a9e5f58ce1feabee65a6484beda810898d4954dad073dd62d2dbbd00af5bdc53c751f8e5de36f8b14ec0ca77fc5c3c997c EBUILD emacs-22.3-r11.ebuild 7964 SHA256 b1f79b32df1ef7a61806dcc9519db27118d0ea636a2d91c5fb20321c861e05a4 SHA512 fd782d43552cbabf115e83b3f713f73a326110358affa28b2963e338023459922ad388623065fb32d0990f8e0d8880e34538644f23a173b73d4ef1138d68d24c WHIRLPOOL 448db7d9cad5ef7f8451c2c1db06f2ecdca47c6de5b210617ba079e411d413544e5a402196f7aadf054a66df84865c399653253523d242b1423c843bfa5d0737 EBUILD emacs-23.4-r6.ebuild 10801 SHA256 d73125c366b49db835f739fd8cbc1b6fcc3fb9e70e13eb8f36843f21c335d7d2 SHA512 bfbff187751415fc6ffb23932ade7d66950ad8e0420a8c297415e7266010889f29beea3178e6a84a9185cd665d01c437d56cf49eea5fd580765a57de83b19225 WHIRLPOOL 46e90e02677419356a92e7c13c51d6ff7f11b5e12c117c00628700d4def529a9958f661180c13bc9b616ba4abefe68c07451ca8f278130f80faf155d3c4ed26c @@ -30,14 +30,14 @@ MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQGcBAEBCAAGBQJTPvbUAAoJEJQzkH1pP7W4O3oMAIlB6FroxgtmHF9Fc50JTTGC -pLumLUKcgciLzL3YvCLL5nxAHQQEXAFh3sknPS1D4RC0OQwiEwvqbkmi7girwMJB -4aefKktFNr/Dpo1+Ry4J+4pkuc1ZITHtVD9UFzfNx28iMCWxJcYdD24GC9wEHQ0V -t4f9NtHFSbU/VX0JleQCXMeWikpS5NmuKw5zT4IVln2MmpAjJrUsHnSoHgLGTHXY -80CHscefYjPhpZzxQHeLUzYorRpwx0VLu6qP31n0g/JfcWCScznZ4poFgTIGpubV -OANSCfSnaJm19kyNwHiTyUEDT8z/FU7oDYBoKK1c8W5Gz8pzLsQrrPvSIy4MD9Ft -el66W5MQPndIVUSOjnI8OM4xEv3dFnoNVa65wTG1RffpTmlys5ik3Lpm1M2KnkGx -kSEPuG+xefUZymDUYvaWg5yJk37+Wb5ox0mm1+CpM1ZS8/SJdNBrBQxjZn2dVU+c -UyonYDHrRrEnn4n8n/gxZX3fF9VAwgPEYj9H0mD23g== -=OT/n +iQGcBAEBCAAGBQJTPvkgAAoJEJQzkH1pP7W4a/cL/2GTlrUcq31rSKkC13E/Qb4c +0alUxTI5SWAOdbZK6QCnZ5IcT0iBbX0hFX+SuYxOsVQM9mL9crU047x1D9v14w+w +Kgygpe375Kq/ofT1ndrEnjKoeSY6PgON0R2HLwuaiyTeRco36AlVXa6FErUKxNHV +chki1x9eVgv4Q0e8Db3vZK+X1xx9++PuNvKuyvY78qRfmrqMCOFpWqWfI0c1XnC4 +z3Ps9fWNax0NHPR3mND8EMovu3OCMV3QVqDvGf2UQU2rRNUjVvUhkOq98xVfItU+ +SLmnv1jhDuZQH9DuWaCkHkW8cxctgUrmBLYI5ju8eYS2i0M2YgP1d+CZ0eoo5a4R +q1SPEVC6+jWdEFzbPQFqmNFGrRn5phJrs71Y75xvt3kUW2JbnJ2CpVjzcBsE8P0Z +203sMBed4tiFfgXDVBnKl0mN/Q+4BLhAMAu8GFIHVFAf0ZlksIbecgwD0EZvgK8K +q06sRq5b38fgeqHLyLBSxNbe+60VEdVBdFR20BD5Ag== +=rlQL -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-18.59-r9.ebuild b/app-editors/emacs/emacs-18.59-r9.ebuild index 2ec4bb683c0a..e736ebd151a4 100644 --- a/app-editors/emacs/emacs-18.59-r9.ebuild +++ b/app-editors/emacs/emacs-18.59-r9.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-r9.ebuild,v 1.4 2014/03/12 05:27:57 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild,v 1.5 2014/04/04 18:18:44 ulm Exp $ EAPI=5 @@ -22,7 +22,12 @@ RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 amd64? ( sys-libs/ncurses[abi_x86_x32(-)?] - !abi_x86_x32? ( sys-libs/ncurses[abi_x86_32(-)?] ) + !abi_x86_x32? ( + || ( + sys-libs/ncurses[abi_x86_32(-)?] + app-emulation/emul-linux-x86-baselibs[development] + ) + ) )" # X? ( x11-libs/libX11[-xcb] ) DEPEND="${RDEPEND} |