Support x32 ABI on amd64.

Package-Manager: portage-2.1.11.11/cvs/Linux x86_64

3 files changed, 35 insertions, 19 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index fd4e447231e6..a487e206209b 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,11 +1,12 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.520 2012/08/23 21:04:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.521 2012/08/24 08:16:38 ulm Exp $
 
-  23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-24.1-r1.ebuild:
-  arm stable, bug #431178
+  24 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  Support x32 ABI on amd64.
 
-  23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-23.4-r4.ebuild:
+  23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-23.4-r4.ebuild,
+  emacs-24.1-r1.ebuild:
   arm stable, bug #431178
 
   21 Aug 2012; Johannes Huber <johu@gentoo.org> emacs-23.4-r4.ebuild,
@@ -21,10 +22,8 @@
   emacs-24.1-r1.ebuild:
   Stable for HPPA (bug #431178).
 
-  14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-24.1-r1.ebuild:
-  Stable for amd64, wrt bug #431178
-
-  14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r4.ebuild:
+  14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r4.ebuild,
+  emacs-24.1-r1.ebuild:
   Stable for amd64, wrt bug #431178
 
 *emacs-24.1-r1 (13 Aug 2012)
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ed2f867491af..afd2f03e8463 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
-DIST emacs-18.59-patches-7.tar.bz2 19400 SHA256 e96d63ae61bbded28b25d1bff6ec9a7e732f870f9f71152200bcb35658ef2f21 SHA512 4962eb2aa2a5aec84417ed8a72628842b022d42da353c23914ade882f04b8f9fb8ad930e9e817a4e93ce9d78d9439298cf4614f147ee4805a1aa345721f0d472 WHIRLPOOL 9ac86c885e49af34bb73b92eab280ddba62fe1ecdff158101ad543efbe9eec9b6f52d1e569b6297505bb154bc5211ff962c7a6c1a26b957b0d87d7881ea7b121
+DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
 DIST emacs-21.4-patches-13.tar.bz2 13287 SHA256 892764ff98f0640ca65b57099a24c76a43ebf1deb9122fbb3b324d3e72043650 SHA512 d44181946c271cb54db7e0e14f3e15b217dceb2cc52594ed6a77adc1347180da58287a647fb5e0ddc3f2e9ec336018c0044d54587cc3c99f8149518bc47a7ecd WHIRLPOOL 55f22b61fdbe137d75bdc5eaf6e5e4cfca8adc913472b2cb4c6deb37d700cef68fd49dac2a7f7a65b8907cc9a08d1249568e3ab075888605346f595df49f15bc
 DIST emacs-21.4a.tar.gz 20403483 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 SHA512 6932db498e7b6b904d90f817e335690c5c681510812332c514af1d84d91b9841ea3eff0357429c7bf866a55ab94d03193fc9cdbf403a9fe4b71d2673c23b863e WHIRLPOOL e711032d23b0e0b33bf95e006d6fc518ddfde4780d23d589fde47ccd94e60687cc9b65b85e04e7af4e8c9161fd8faebf13d28f4f43eb94e7bb7520d537f28751
@@ -18,7 +18,7 @@ DIST emacs-24.1.tar.bz2 41722508 SHA256 eeea272732146e2be9aee2f8d71d6cf07b8654c0
 DIST emacs-24.2-patches-1.tar.bz2 2684 SHA256 0e941340c159d00091d4a275426caf90197dfca6afaee71c41c35b9c10c4c0fa SHA512 3880862267767e5243044412d8d92b30988362d3d09831df023fe284300527b33ebd587ff99ac1213556075d8c24d5f99a34f6eb4750f02e8cb261ca1b3cd249 WHIRLPOOL 855156dfd4fc996f92b994b8033211a0785d8720915d8c04a839c6dbdaf88178394ed2c3457c142eb643a1d7c076dc5e88f3fcef81fc03513a8000599a4d976c
 DIST emacs-24.2-rc1.tar.gz 52117279 SHA256 75343db1b5d7d9366f1daf9b6c4a68711fadde9bf1916c99dc52fbf26c3df7d7 SHA512 421336d03038d4ee79734bce1cddfbc760b14b2a06be19ac499b17c28d9d7d4ebf7590e9aca25f4fc7fddc56aa0a32e5dbb8f0dcef85086c5808589d40b5cf4f WHIRLPOOL 08992cfcdc3f6bcd27634b75cb652cb598335c96a0ebddb3ed6f380cbd6591fcfd770cce5aba29d16ad3a296ac76901429bd3fe027ee28bb406308f1c4e217fb
 DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1
-EBUILD emacs-18.59-r8.ebuild 4360 SHA256 89d4265e525b72fda6dd48285d836ccfb32baab21933ec396b68d195bb8e046e SHA512 7280d39fd2831d1d95d5ed99628bb8d18a62a62181e82b00ed432329f17682ae3f418977787857deb1f19da417d03fd3bf9b7616f611a63d69324d38cd8c665a WHIRLPOOL 538854d60683735989855d4d830fc34ff3b6e9a00c46f5626a63a58efe3c1ccb458766a5395870a41e07083a006c94029762c38fa7c80d4d789ba97b126d2ba9
+EBUILD emacs-18.59-r8.ebuild 4465 SHA256 03ea44d6947cb16fc6e9d23c320eff236ead308bcc8235a12b66d6b3377b94e0 SHA512 42da84793eca79c79cc5e9b9bc12d655858e3038036d1c5956e21d151ad90b8b5fc05402bdba0b7d49cfbdff8eb3c6d51cbffb90e1bf0821a01bd3252b4c9a57 WHIRLPOOL f3ec16d7dec537ec3ab26ea845d931b9fb15cfbf19e651cabb86c8daee3aa1559a7ce8d1a7232201d56569185b6a6f7becdb464ddaffa5e409a484563172f5ea
 EBUILD emacs-21.4-r24.ebuild 5284 SHA256 776809827be73ed5d05200481616f773874afe57d3a1961af45d9a3ee21bf996 SHA512 b79676649cdf365d46766e0fbd9d194f4e67088edcce0f5629432ad50c31f82a10a0dfc02e087f7826f6bd1be420ceafc3f1d11a1eb28495922c47e0363baea0 WHIRLPOOL e2342b766e6330d05164cf6a32637d7016c11aa9bb1b890d532c8deff2269aff82af549945965c4dafaec53284758057732003159bd2bcf1ecf784bf266c4981
 EBUILD emacs-22.3-r10.ebuild 7737 SHA256 6476d809c6212337eef942a0f316334086b31cf489be6ad371909aba3e35bdbd SHA512 8f451780e91b31e78b67644c1d1b7440de3b291577641b2d791efefa88e7bbcdb7b833cd9feb8892a7b3e5f2820abfe27d503dde8c6df4c19c0d2552d1e3fc94 WHIRLPOOL 00dd2e49e6b3805187ec4bd5466098c764e86c140bd745a35d49dc102e2a2e258bc45b67389fcba5471bcdb0005542fecfb731811e696f5fec56d06289d98381
 EBUILD emacs-23.4-r1.ebuild 10927 SHA256 f90b9b96217413739c1dbb2459459be7ca4e38ed84d519d46799deedeb3ffd49 SHA512 b3a08232c260826507d0ffdd49e4dbc14b5cfadc63a44aa6c70ca6cff9efe70413dcbb4a3ab9f3d675da8f27a49f805bab9cd5b2da3d98f9aec1fd22632e70e0 WHIRLPOOL 15c166469c31297e11bfcd84ac2d594fbf04e0773717d5e78307cb99727f386bd5e16a1e9c129334b665f5737dc80984d01673025120d867571601cc1e56a535
@@ -27,12 +27,22 @@ EBUILD emacs-23.4-r4.ebuild 10593 SHA256 4bdc84f84d21121df2f644ee5c3d66301a0efc5
 EBUILD emacs-24.1-r1.ebuild 11022 SHA256 ef98dc74e51a21337354ca5e31f3c0e6bb9d9a70d4812d8559f4a841aefa3cb3 SHA512 b25b0ff8ed05f60c7dc59ac5b6ae6d88727750c2f74fddbbece8a72fda9e1249977b7b424c811f4ac8bb0656c77fd81fd45981fb04bc0191e70b5536fdf68afa WHIRLPOOL 0701e2d31f17d0b800f7ecdfd502ea16d57d5ca37a5cddcd3b8c699cd4a5bd09d45fedb68f220f360df3281ada46181ced437764aa0f6979a85bc20204e5f650
 EBUILD emacs-24.1.ebuild 11019 SHA256 9503252f00d8fa45c94e04c6cabd0ddcca4913b415e9063787eb3a6761d746d9 SHA512 c1432db9e5c174fc2de411d66c2a26a77dfd1d9defffe6b83fc112dae7358e59a9f27c45efc2627952fafe8e76167930ecc04ad63819a038ff15576c41175b32 WHIRLPOOL 185b91bd00fcfe8ab59d264b1a279654b95425611702076ab60f8584e284ea84cfa8246b004c2a79d82d42b1e73ddf17b69e573ae0b7225ae9e63f18ce6cfb9b
 EBUILD emacs-24.2_rc1.ebuild 11045 SHA256 a2e643d47221032390ec4d9ff0bf80222919b5257a25148bccdc4ba87d64c9c8 SHA512 cf26583ec29491dac1de3a244751aab0b2438eb4b3278c33521dd7adfcf050893c711509ce4f56cb8bb520fb56e4c6650acb501444dfc42a02aa2f9ceab8629c WHIRLPOOL e21fffec0f429dee2ae48783ea5602dee80060ac9e00074e855994d68f17510ab845fd4a681dc26b1d144dac873aadf251f6436cc469c5111db9c31ac85b1af1
-MISC ChangeLog 73523 SHA256 881ba379453b2310bf11c0712be5917fd2a2e37274b2c7bbb09b913ab24fd462 SHA512 933934944dbbdacb7c5b5d33c90392d97070a585c59e55aa1e0034dc0f684cda9343bd1d329e5e47ba03b2084ebf78ce753582df3248da12928a55554e2f2816 WHIRLPOOL 9876061ab6fd0ce752d8e8e6f8248ddf95670835c38ff4d30afcc93be6025e9a186146b7853a9b2472a4052eb3a6c7b24e3909655064b4eb5aba4770c98dc04b
+MISC ChangeLog 73462 SHA256 b68e59cdf8f255c127b8a193bbbf293906cf259e9397ae33dd81885c7d2fba89 SHA512 358495635987ac256cd46940c0a2767551d48527d9dbd1d175662cc5a641dbee2e82bee82f8caabd04fbff7eaf666a13c635177a6a9a719aaa7e4b35e6389fe2 WHIRLPOOL 39097783d80ed500885dfaefe77d38d69cc4f6d78a21857a0029dc481687666a445084b0a3a8515fc2a9f97133e5f8d50b5cb741972969330f328651dd984669
 MISC metadata.xml 2456 SHA256 8bdd732f4d55f61ff12d6b3e2bb86fde9179d6e28a2db04fa8f6e1ce370309b1 SHA512 187c76b76f48ef69232ce84a51e316f636b8cd14489de29313698ba3b1ac8abe7d705fc3c833d2c685d4a671df35508c5d973f32cd43eaf03ecd7e8e8740448f WHIRLPOOL eed1249a1876926833184777917d88d281a0b1ec86f79cfb064b60d4cc09a9047cf08beb726dfe3fb9f5f36c58ebe16b1989f5bd158a9b945cc489039807c4e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlA2m+4ACgkQkKaRLQcq0GIgiQCcDjnCssq2Z+D98U/pVYmloipo
-D8AAnRxT6Ug1CrvPOmbFP3iNJ9c/VKEF
-=b5nn
+iQIcBAEBCAAGBQJQNzoyAAoJEDxpGckxwJCBZNgQAMBENMsGCOse1OIwEGCDQ8xk
+Y6dL3PqfsdfyOyj/JIHi2Zmujx7YqfxDitinpXvtKFHxFFXRrmlb/nGcUm+rqtg9
+YMAHvuCLaVKu3Z4ZCV7m+lEnu+nphffMPKM/r1LKsA6xboZR7chBcjr11h+BVFnZ
+hVGX8Ae4RzKrPm8pggdadcBX/Xy95WDh5FZFCLoHFlnHV4RWgVQPU1N6BgKuZKyK
+CknqiLMTD2PxuiXI3+3vjbsY7l1TWZhXBtIGomyc1Ez9H9gzGyQe+DVnnj6DTe8+
+nYQpe60gCj4IrHuPfpqvE4MUu+53okowekf7gPqS4prMg9jija48paW2/1JdZxnM
+1dYW9fd3wzY9ZtdgwPNFliSl1R5L54Ii2ntKSVPnDFav/Z5hXDb2NT+mKUciyEuH
+WTw2W6v7dwHvZG87p5fOy4QWSSwPiKbJYYOGjKGnO5hILT/Vr4ek/Rt3q+7vZJqV
+AAcz6Zaapw+A5tAM1yX1OgEYRBc0A8/vMR4I8LuncsfSqKP/aHYv4zED8Jg8gEeb
+87sfsrKCqbhroiB8LgIcmWrgWuN5m31aj92ORDn+YO7D8yvRaCp3Gc9dyea4VXBX
+bEmrLT7FY+VOEe4+EhE2/gG07LPxWqptko5n3UzxJvPqps0uJJDEa+YpEcyCBGlT
+3CWq98WIlMlkAD5yO6cK
+=B25f
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index d2b5027cb970..7feda40be41b 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-2012 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.5 2012/05/19 15:58:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.6 2012/08/24 08:16:38 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	mirror://gentoo/${P}-patches-7.tar.bz2"
+	mirror://gentoo/${P}-patches-8.tar.bz2"
 
 LICENSE="GPL-1 GPL-2 BSD" #as-is
 SLOT="18"
@@ -32,9 +32,16 @@ src_configure() {
 	# autoconf? What's autoconf? We are living in 1992. ;-)
 	local arch
 	case ${ARCH} in
-		amd64) arch=intel386; multilib_toolchain_setup x86 ;;
-		x86)   arch=intel386 ;;
-		*)	   die "Architecture ${ARCH} not yet supported" ;;
+		amd64)
+			if [[ ${DEFAULT_ABI} = x32 ]]; then
+				arch=x86-x32
+				multilib_toolchain_setup x32
+			else
+				arch=intel386
+				multilib_toolchain_setup x86
+			fi ;;
+		x86) arch=intel386 ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
 	esac
 	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
 	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"