Drop x32 support in stable ebuild due to broken dependency tree.

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

3 files changed, 21 insertions, 24 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index c8d81dd8fc8f..12cbc73b826a 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # 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.608 2014/03/12 05:27:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.609 2014/03/29 11:56:09 ulm Exp $
+
+  29 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  Drop x32 support in stable ebuild due to broken dependency tree.
 
   09 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> emacs-18.59-r9.ebuild:
   x86 stable wrt bug #502262
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 84efee2304df..7a26eef00f80 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,29 +15,26 @@ DIST emacs-24.2.tar.xz 34712012 SHA256 1f11b65520611d108eceea886cc1d2573704e18b1
 DIST emacs-24.3-patches-5.tar.xz 3260 SHA256 ed9928b23a8b73b3ad265ba6866f609cdf61524602dea3b9f57d397d13a6fcb6 SHA512 c5989a9920c5b8cf1935f2d1bea228262c7953516cf93f75dbf6b305fc7c66f0d22c4038931972c441b8c0508acc04a83c7a160e20bf18b2c2e25c10d20f6a5a WHIRLPOOL facb1dd20830a87c8ed0480168127822cfb961cc6592d5c51c9057dfba944adfd4d3211ac7af07873b46fd78580704325f56ab4a5dfb6f78790005b718f19364
 DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
 DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1
-EBUILD emacs-18.59-r8.ebuild 4717 SHA256 c02f78fe6fd68875a658b7e50f5587e449db5586237e83a3242dab206bb1c5ce SHA512 ed924f35e1eda58dbfb807f61cbfe32bb549bc311662e6cbe2394dd64faf7939a23216ef9eb4d8c3f723f9ab80938556923bf385f739aba7bc8050bdccdbfe5c WHIRLPOOL a3fa2c4041bf29c562d2e18664ed7c4b2659487e0d5657aefef3f1638e5f1a8d042ea5b20ef4a8e73385b83331a2559c07e75dcbb9722a0b3565c4701250e289
+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-21.4-r24.ebuild 5286 SHA256 564082d9d96421342ec92f1d303ea07fb44ccf4c10aaf0d746a4fe8466ce7f74 SHA512 dd34062685d7c81e080d1ecc31de6c2da5ff6bf1e8f86794724c4edfad5dcd325e6f10e90f96a4700f48186bb4c887a962322a97ef15f57544aaab3250885b26 WHIRLPOOL d1baaf141b4833d23f12628b21b168f624a3f448b05103f123034744bd3de45d209369d6c3b91f038a31511e19990eeb0c1ac02ddb6da28123080726a579195a
 EBUILD emacs-22.3-r10.ebuild 7738 SHA256 5a219fa5f170f33347f07f4fcd8f52e8290bb3cd0c0be2c4abdadefd311511f3 SHA512 35a1450f8cbaeee5a14b7a8fb5e428e473b86e3b31481fad0144168a07b5f3158c9b2c3e68e244f1c14b8b044b1d0736d66e249239482ca3aa4b8be4ad8cfdbd WHIRLPOOL ace481ef8a33d517cb153545fd310761658d592da4232ab8d58c79e4c42bb742436a44fbc99ad91f472b9586bd62c20549347cbca7418c133a7a5b92ee66ba0b
 EBUILD emacs-23.4-r6.ebuild 10801 SHA256 d73125c366b49db835f739fd8cbc1b6fcc3fb9e70e13eb8f36843f21c335d7d2 SHA512 bfbff187751415fc6ffb23932ade7d66950ad8e0420a8c297415e7266010889f29beea3178e6a84a9185cd665d01c437d56cf49eea5fd580765a57de83b19225 WHIRLPOOL 46e90e02677419356a92e7c13c51d6ff7f11b5e12c117c00628700d4def529a9958f661180c13bc9b616ba4abefe68c07451ca8f278130f80faf155d3c4ed26c
 EBUILD emacs-24.2-r1.ebuild 11004 SHA256 e0b04d9da0ec883437134abd0253ea6ededef096bebe5c76a64883489eb9b89e SHA512 d3a40b1c261d0b0c217d6fa1b4874781b78c0c27e6f8662f4ce0f279d20dec5e1b32ba566cf56df25cb8f7b1bf72b54a7c4af478dc95cf948edb77ffab3682bd WHIRLPOOL 22e196214a7bc2ab00b40711d6d51bbac08cfadc2e6c9d5778be02b22c406d3601238870172ef28ae2dc47fdef5f86d35ff83aea6d88ee23112b06f2c0fa2dc3
 EBUILD emacs-24.3-r2.ebuild 10786 SHA256 a6f2a4ca08e974997d213f0a21fe0b905bbf67e4b1011310d679fd05c0cafe06 SHA512 17a0c52e9fba474ba20fc3a6afdce26d41a33ee072f4402c3cdbd704ffa2163aeec3b7cd90e223f7d2e6abce626744855bebd667cfb6a906f9276c400a9b40fa WHIRLPOOL 56a8fbcafd7cc74fca1065680468073cc2785d17df9aaec90347e5086481f0f0403ffadeae8186bfab9edc504a04dce04617abcfbb24b5b9dc766d878eeccb89
-MISC ChangeLog 84150 SHA256 65e19f855e3cef4b0eaaed4647c93a322a28c4eb18568ab9fb45f4e3bef52de5 SHA512 bb5922c86c60c934eccb501777cc73886487ea0299682ddc88106d1e303e85018808004ae69f76f2cac8242122c37da051a262ec220bded9d8da835a77e2d96d WHIRLPOOL c5959867ebb4343809c8db15b87fd871311570853519a9548562604051dc98592d64916c2f0dd444e1692b16196df385514412a288101d9de333a60dc7851f4d
+MISC ChangeLog 84281 SHA256 355e7ee4282c7a9c95a747c401031ec006b6f597c2d3af1d4746b537b34ca580 SHA512 09008c9c069e0efd22f52f9c549ffed9a641c8024436f60fac33f9594d74cb2964204ce58a1ad7550fdadeb55b83a838a96c00854f9a17046525262789ffe951 WHIRLPOOL caee820d2246f34efd116f8dde4533f7d00c1a98954de5f627043aeb9c2d3fcca126888f13c211910d3a4fa5896e4a8d89ef9884385b88159da88aab10f32604
 MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTHE/ZAAoJEE8aJVXqcZkdIwIQAJjLnMIVxgKXqAXNhwlbiSHF
-E/fcfuTbZHw1Wye8aI/eg0HgvafafPtJc3YG2UHa1ofam8qNxi4AfyLa0GHSLBdF
-jlsymP/X1zejs+1wXd+26Tzf5J02r4NToZY+wkq4kA7a2JSBRP8UDWiJe+crZGMB
-LVqSeOmKnZmQ9pbQQvgvGcdjYCUKSPAZEgnm7c2t4HFEGUqiiFkCw43vlb1alcEh
-6ZrRCMyVu1NloGxrustA8RwWY1hH0BOdvOO5yU/uIO45CHDIFEPPoEPn4hblTXP8
-v9CwvZdge0Ffqo9fIfBljyVxHj6F2Xgxd+lBRuP95uZD8mM4FoVY0ne/Q7UiBSPP
-W73sS8bHqasmhLLmVPn4K9xPVmJgJXD0N+fm4l/K9PcMgAU4SofthMawhHPz49rx
-SHS+y2RefzEZ0HdgIcMIWGBbNDEnu22aZ1wVhVnfb+6LSOa7lr9BY3zZTuSMVSAM
-Ru9Ymui7KqWjM9fJVHVuD5wR07itHXlsachEfmX3Vh5N41u0AjIBkkl14csN1tHJ
-lrr7stIcR3wn/Mhfrp2NjykNL5LcwArl9tTVQaTgHNGBWmODsgqcOq9aU74E6GID
-4kkaVUWH/BNtvxFa9T33WJKbLPZAHTc/d6PJCTfj/Ldcqa8oy5hVchb1VwQwitn4
-qrKi/Y22rWX4OeCrTijs
-=otlO
+iQGcBAEBCAAGBQJTNrZ2AAoJEJQzkH1pP7W4vagMAKSo73+cplVLBYGC7Io0+IfG
+7fMx2o3TkWZjcn/dE3XSyxACXxALXfbjXOEmfalrxbP6YHvf2mV5e/hr5mFaAXrh
+RwZq4ik45x8SQMCU72ps57c4h3dE+xkNmMmypFvMbt80aKl/1pU99XqgNmt0tx4E
+l2o1OyEii+zmwc0NB03Ki/n/wd04VkF3Wnjypemc0picLYcDiIH2AqEvmsw3fQZY
+aOtFfm57YP8wq3Ci2AEdhYnqoUvy0th5Pm30iTeH/W6EgVhFCj81XeYgnuIIqz1t
+RdzWeFP8sd/mEcmhDeHYt1hkviy+Zmn7TaWLf6FAIu9AqBbmibvBphuQnFTS4keG
+33ZeGVmiVbL9XH0dMxys5LHFIrVJbiT4VwM/NDEdqB8atW3U/j8PB9pcrGDKZvWY
+ENkECoBm8+aEmZH4qPHvZZXV9XTpcUmx6sKAAnVsyvJ5mYVU+39B8f1kIkNug30D
+GypAr4II4/TCDw2uYBENhJdHuZY+zlnvqY3e1DlgHg==
+=HysC
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index 6d91a19401bd..941a99fff890 100644
--- a/app-editors/emacs/emacs-18.59-r8.ebuild
+++ b/app-editors/emacs/emacs-18.59-r8.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-editors/emacs/emacs-18.59-r8.ebuild,v 1.13 2013/12/26 16:14:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.14 2014/03/29 11:56:09 ulm Exp $
 
 EAPI=4
 
@@ -19,12 +19,12 @@ IUSE=""
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
-	amd64? ( !abi_x86_x32? (
+	amd64? (
 		|| (
 			sys-libs/ncurses[abi_x86_32(-)]
 			app-emulation/emul-linux-x86-baselibs[development]
 		)
-	) )"
+	)"
 #	X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -40,10 +40,7 @@ src_configure() {
 	local arch
 	case ${ARCH} in
 		amd64)
-			if has x32 ${MULTILIB_ABIS}; then
-				arch=x86-x32
-				multilib_toolchain_setup x32
-			elif has x86 ${MULTILIB_ABIS}; then
+			if has x86 ${MULTILIB_ABIS}; then
 				arch=intel386
 				multilib_toolchain_setup x86
 			else