Update multilib dependencies.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 7c6d28f46a70e90e6212aa90295bdaa23a6cc0a8..559d2a28e389d737d6c27da03a0a4b0e31e2148e 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.664 2015/03/28 21:26:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.665 2015/03/28 22:34:25 ulm Exp $
+
+  28 Mar 2015; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r10.ebuild:
+  Update multilib dependencies.
 
   28 Mar 2015; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r13.ebuild,
   emacs-24.4-r4.ebuild:

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 00783dde21f690aad6d8a5e6c511a426ae1eff37..2865feab272d25ab54dac4b3226f6fdf178de233 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,7 +15,7 @@ DIST emacs-24.4-patches-4.tar.xz 4652 SHA256 8b97fe775ed120df42e6f3afbe3ce503c0f
 DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc
 DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
 DIST emacs-24.5-rc1.tar.xz 39754360 SHA256 f5c15527cf7b470423633c189ab1210a9ddef0f824b422f17dc00ca1bd015104 SHA512 e1ed771ba6d20df37f22a17a07ae0470fc2be4165c8ed989837eab2b1ddaae6814753d30496f8ff4b58961349f18aacecb9e3d59c021fed34a6bd9eb4517035f WHIRLPOOL 099a78e9001746dab8798d28322b39efaafd281cf8141a8b1ae448d9e8c70fcafe993fbc362c1ee799df1450f72da1d8dddbc28856d227821f104358acd442fe
-EBUILD emacs-18.59-r10.ebuild 4297 SHA256 74c5d7927ea976e02680e0a24a90a270a067787e45cbb74602c8e7e513eec166 SHA512 d19f66368ed77bd4caeb260b098e79077a8e87328522d75092297c2cf15b39deb267518242f4939405a99365682653506374c0b6942be267816ddf9419a0ae4a WHIRLPOOL f8fe6dd1b04e838b0e5acc2d199a2d356dbf5ae61152a3ec9df156eceb04a9120743f8f98b04b27ae620b7c30ec5e1841df65b86a572be0746044969c42699a5
+EBUILD emacs-18.59-r10.ebuild 4208 SHA256 75ecaf90d9417136fd3c89e532fde5764a4dca31c8be2f677e27e86e63e13bee SHA512 2810e0ea53b67af7a0afac88bbf5eda3e0529d9c55546a43c6a0edfebdd6d6318ca679079c41fd332362317d2e5492ad6138c802880b30928ef9a3583dd7aec2 WHIRLPOOL a47a38794bacf3aeceb9221ad41573b42e2b50e8f3cadbad7bbffb7e662eb0ad46d6a60a6f99aef8d02a43af5b5b2de588ae74b4f4e349dd8d95c64f731af976
 EBUILD emacs-23.4-r11.ebuild 11320 SHA256 cf04e92c7c20bf3b8e5bbab062fb973f1aac81ca22b3575a5f267fd299f0d3c0 SHA512 7db86ce284dc9df0df4b2a00997cfc77b3067c8de277fdfe5bf794698bf018ad2c6036eaca84982de03f777bd746f23312267031924b7616d9078642a014bc70 WHIRLPOOL 863e5d02d8af5e70a9b57c6e82c2b6d2218f87a3947742febd67b9aed55084e38e18bd8489ef7514366bedf4db94605412f9002f114643b054d38b3328e22637
 EBUILD emacs-23.4-r12.ebuild 11310 SHA256 249aa3f72ecef6cbaeb9f7149dade700b53bc101fc2e1022d1f31a327cd017cb SHA512 c67923d31c1112f342fd8ad6ab3fb6f2a82daada8053756ea027a7de9e7cca72f9f4bad080b05b6b06d3dc4ba3a8ecdc0b931c2e6c46c975242e2cb0c04feeb4 WHIRLPOOL 50f585e87a8c41c16475b95976b6451931c73749cbea79137297d166ea809aec93f814b9b315980e848fe29e64f3dd2d7114718256f4f17d04f6fb1672ce1d98
 EBUILD emacs-23.4-r13.ebuild 11307 SHA256 91f6e9b6791fb1a8881e230b0171500a2c8b6c4dc0103c48e8b9a7bda747f1ae SHA512 3c29dc012cd806df7d0ec45dc1652b1dd7b9da03b7f63ef772b0b02065a9ce9daf0fef26687c31cd61794eab566b0d5fa5b304634b19b22820e171dd4b26f254 WHIRLPOOL 34e400976ddec93c2b708c830caa8565977cb52775dec3524ebda5dafe1c1e6b4d0a728367d28b472ea31ad580f04f816a736a456b3f311bddba2af66863547c
@@ -24,22 +24,19 @@ EBUILD emacs-24.4-r1.ebuild 10674 SHA256 bdf46a1e69d26b446445a767caae59827bb7872
 EBUILD emacs-24.4-r3.ebuild 10669 SHA256 978624cd544a29e8100c2bd0d1ee98535e05febf26a8708b5557a4a18f57e9fd SHA512 a9e3a91247afb260d2b394e8a41622aef9ee5d68c6c45a6ffc85cdf3450632dcd15092d0505c11452416cc398a339ac0a434cbd8c78a4ad33a5592145cf4da0e WHIRLPOOL daaa15989ac8544b9eabb4954a4eb46af6a01bbd30e6aee7b91806f04ae619d8658bbec24eb9e2a7acd3eeff21871f18aac8d19a97c43f8d40d7acd353c023cb
 EBUILD emacs-24.4-r4.ebuild 10666 SHA256 c052c8d80a293cacee11319c132e7da4807f4efaf0bb5d724417ba6bb69374bd SHA512 9bce1b65d2b1d87e313808dc19a789a04a308a82329181183a73855485f65d86edecd96fcd1e2db2497aafc6a1188e1c156dc9f05792c95a4f931bb2ec58f823 WHIRLPOOL bc5b50d86e201365cbaea12c35ba44f142b012c27fc4df2ae08abdf9d2f8cb87aa311a75d23b61231d1b107f5942c7c4abddcf48e3eb64f63d936aa36531a86b
 EBUILD emacs-24.5_rc1.ebuild 10746 SHA256 921d44463887580b7dbef4d766ecb48216835eb3a1cea80ac344a06a6ded06e2 SHA512 bce63b01db392237ef3161075efe08d09ae177ab2e6c0d29de98f7845702e1a91144f9a00f4a204823e6861c2959586769c481bfc1d06383c2d627a901c6eb56 WHIRLPOOL 8357b227761a42a7d601e1e18760da8f015a4a05fafc48bc71c44b5810ed8a28baaf60ee2fa93945406610df6c270ab666af4875dc39c3b909756885a16d64f6
-MISC ChangeLog 90844 SHA256 d250633a11191886b6be68e65a29adfa81ed6afc98ed2c88b9189326cec5d380 SHA512 7f1c724a103507211030c3d8f230853c1c4cfaf2e9567c37f8fb27eba20b968a941c7f1a2bffebc6937e87ecbbee3084cb7da81238a9cb04a3321611693774fe WHIRLPOOL 5244141c2620294461c4c0e69fdf6f76bcf6371557d1bdaad3860d75ecae7a9f5a586003385e672113ac5eef6dc63be5c8b08d8c5357ef40702357ac5ae4f9fe
+MISC ChangeLog 90948 SHA256 7ded4b5e36dfe571ffefa9616d313da76652ebd19d2ff6afb25d77ee4b01b74c SHA512 a50436aa29c08f4eec6622cd0612d73eeb7781a946bde14f5e093e189a878e6d05d3d07051c49f400d14a47c14def035f78b99b720c3aaac3f68b5a1f8c7fc08 WHIRLPOOL 51fb16560c3008ddc9c96f1ecb7b00c92411dafd52c787a8425b3c66e643650de04c3f239ac850b524b3fdc2e63a263930fb12a2f19d09ec34bcad58fc7f534d
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVFxx5AAoJELp701BxlEWfMfAP/2JpyPky55+VyG7BreqtRgAI
-6R9jKR5vCmfHwZ8dBOZJofLNuMbg1rbY+1ACDpuiMmOeChqktKeyS1dp7uevSHXi
-2oJMdROP8N9crHXtlPs11Iy6Fn/ACqLczwEoOk13oY0RcuR2mm+YykVRxVHFcG4A
-JQs3xSrEIYjkGOAmDWtir6b0o9b2y9DbI4YTtcuBFqVhd6j3swOz73Y0kg6QYaig
-Mtq6nlwzAEbniaGP8EBtneSW/4YI0dqZvxVLp8cMCw96lNnZNN9RyKJHE9+gvAYn
-3lSLtCZppLC1mubp+JAQSevbf7GmLDxf7FviOcexgxVhFDAdkxidWdL6e2/bexEC
-Y5ZJzV+GW06tCuiqVWAV/zTrtwBjV/f9TTo2C3nKPSZEMxZ3TjqEVqmEfuMDlVmh
-USKMLoPeB8I4R5OikTp2x6lWYL7MN0MoUxSJ9C3uzMM9OFwL1ow495NKd9yN49Uk
-GU/0TVNKZaI+VFENJH5hQ1Huxjw2K9kXS500Cs3mivaZcrBdscw5aT7+rW4M/pd7
-m19oL8DURZitCAUCMdMJztudGNwx4PA45ET8qNqkw7QOQN5GAAhJmF1nwpKqvVz8
-aPFiKnQI+0Q/OS5n3mg9gQGY7n+tuU5dlm4sV4IN/tiCYQJgaTsf6kj1fBQlvasb
-sirXVw+g5cUiUIVr+QGp
-=3I79
+iQGcBAEBCAAGBQJVFyyEAAoJEJQzkH1pP7W4R5kL/RecbcQ5OeXRspOUO59CizBy
+ApnnRx5UOBX0iUNfOaQYhTdsLB+Fx9RjE3YcKpEBmpapSeic4cKRx8fKrKB0YIeR
+CFQZ2/DaY1Y5qgctD7Ndl0vEr0hd+rynhOEU6uEiB4KsR46ByvWvnjGmLPgMvfSw
+ZQy1esUr2QFeEMRiXHy9wb0/aovzZxxNG9cGr+PMHvYw8MiX22jO0VwsRqV1vikm
+Xxbs908ixUP/O+pZJto4ClPdmSkJcxVB3q4DSP5STQDV13TzfWW49qFlz+Kp7Auj
+sHyG5KsBqn7MAnMxP0fCh1BD+HC3D+WnQYurF2ZQQ1p+QkyEsrkh8+WhjdawWPkV
+/S7Kzj8lPEvS1/2/Jmo43n7fYW751qgEgEun4WSy7Qg2IwJLnjsWWU2uuprvv5GC
+5marzf9OocyuUU0ZmtRkwFV0Ib6waW17LnbhH1P3q5sbShZ9pAVORzf2qImtgTqd
+O2LU+0gHf4SdiLM6sU7wsAS7Kf3PaNteeqys4hvjAQ==
+=EntV
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-18.59-r10.ebuild b/app-editors/emacs/emacs-18.59-r10.ebuild
index b9a77f1573f0938cf48bff8628bb19df7646b382..e5c0d02d612e1fa7fa3a507d0946ce598a3b4a50 100644 (file)
--- 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
+# Copyright 1999-2015 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.5 2014/07/02 07:21:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r10.ebuild,v 1.6 2015/03/28 22:34:25 ulm Exp $
 
 EAPI=5
 
@@ -21,12 +21,7 @@ RDEPEND=">=app-admin/eselect-emacs-1.16
        sys-libs/ncurses
        amd64? (
                abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3[abi_x86_x32(-)] )
-               !abi_x86_x32? (
-                       || (
-                               >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-                               app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
-                       )
-               )
+               !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
        )"
 #      X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}