Fix building for x32 ABIs #427726 by Joe.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 35 insertions, 9 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index b80bbaa677ad..bbdef1849a19 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.161 2012/08/19 16:59:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.162 2012/09/23 22:28:11 vapier Exp $
+
+  23 Sep 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/libgcrypt-1.5.0-x32.patch, libgcrypt-1.5.0-r2.ebuild:
+  Fix building for x32 ABIs #427726 by Joe.
 
   19 Aug 2012; Raúl Porcel <armin76@gentoo.org> libgcrypt-1.5.0-r2.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #418391
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index e8efdef6e0c9..b04fb42f7388 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libgcrypt-1.5.0-uscore.patch 981 SHA256 4cbb34cebce02531b9b940494b78b7186b2fd05b802866d9ecb42d478e88e845 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601 WHIRLPOOL 6b6b1944539127c9c41fda46c54d8e331597d249ab91a0024a38d60a907a0fba114fb064c8d956c90a91e27e6ae30aa2e6dd4a3b61b2e8d771e53499b9810016
+AUX libgcrypt-1.5.0-x32.patch 371 SHA256 8117456bc7cb569d349b4980884156ac9fe7d2585d353c86b9f011028dd2ea12 SHA512 83716a319bfa355e828c272e395b2ea7a5176596ac43285a10b4c2548978c6b432af3939db760e7bc209e924d0758cf4f0aa260f7e50dc2dfd73f3ca7283b8db WHIRLPOOL e84b783c4f34454119185360fe9ab6b590cb204b28bc957491fd38ed08c397902341876db99df73516202a6370a74cf29b4071e33c5fbc452197942bd492639d
 AUX libgcrypt-multilib-syspath.patch 588 SHA256 a3fc53f24b9cd0355a5267bc3ca8e88c397878473046536068c8ae4ae0b526eb SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc WHIRLPOOL 8d066987dc3cfa1dd686047fd5332b11199e5add63f82e397a34b22b5ce2f97af17d60042681c1eb50617402189a0d7fca5db48db7d41f4ef0f1cbe1acc645ab
 DIST libgcrypt-1.4.6.tar.bz2 1151877 SHA256 3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85 SHA512 d219b23b36870a526d378a4ce784abc044bcb3a547a5e667b8185f2aceffab707918a6be6420d8473fc0c4d293968be5824b5dcf0cc5f0ef0866490f250b101c WHIRLPOOL 1725c87e68aee064488a6abd2be5a8541a0dc98a191c708a39f7f13faca02d92748d87b1ba9a0a499711632ddb484a23b72fe7cac2a2d11ea30c9b9b2a6986ae
 DIST libgcrypt-1.5.0-idea.patch.bz2 4291 SHA256 c6facb5733454cbd5ab0caf76b9ffe32a95973853a67cc422697f5f1cb354ad9 SHA512 1368ccf6bf8c78717fbfd1e6c05526d209a9e5c714ca5063cd2996fcf043cf15a12f0798385a6321b0525b52fcc9fa87c52be7101ac37e656dfaec2f093e34f1 WHIRLPOOL ffd011522b782cbaaac1b38f44a943956cb2275518119bf4df73fa914a473469db90c0220c81293fb8da3be43f34b89591ad47c6d09a144cb7059f963e1be414
@@ -9,14 +10,24 @@ DIST libgcrypt-1.5.0.tar.bz2 1433506 SHA256 4b62fc516004940a0571025401a0581d4919
 EBUILD libgcrypt-1.4.6-r1.ebuild 1167 SHA256 0d9c4e0a4a0a96304499a18706fd9860c7001417eec1cee064feaee95d0abf89 SHA512 cdc03a6db8855f963cb4ae8a8d425b37afc78f27fb9b1b6f0ed0a6dac0eecb5d23df002e719d53bfa1281140936c0be1d5f8b26bbd5caa11a9e88f8e3feecf8e WHIRLPOOL 98f1ac867298b446ae73dc68d36f4fc48c564718083c961d7a801cd4feab2ddfa6b2606cbd0aa4187fabcabc4fb8380e84319aed03b2019fd92d18654fd3ee96
 EBUILD libgcrypt-1.4.6.ebuild 1126 SHA256 e2bf303262e08375c82d10c921c642bfe9383bf3c5c64a7fd20e1d4e704ecf02 SHA512 b3e697c1cf47af7c79f229a2bb76defb21a78766be4f6412e529fce951f762913e4404876f69aef5da134d80a7241c8d68501a00c60e5defcaeb2a886529e57f WHIRLPOOL e924deec49b1f64ec61735871e81663e33c45f359a897a34ed6ac409346614cf73b808bf19448eaf41e596167d8e960d20226ac9b8ed6b2997bf7dd3ec17d11e
 EBUILD libgcrypt-1.5.0-r1.ebuild 1174 SHA256 c277022044879a876462011cad772a651091aa7695d9326c9837fa3df8b0ff4d SHA512 1beabc4c848acebbd2c356ee2a436e5459b8184336101a6175cdf8f965267f8c3d6ed5fb8fbb11bb952fda62dafdca6e220187125bfb55ce50a245f50565a544 WHIRLPOOL c8e5f976dd833e778234771bd153fba9592bf4a3f7c6a42294b484ad9b759c56354a1fa51e992caaa0d8e00e14840db3aec54f3d22abc19286f64ebaad6fec65
-EBUILD libgcrypt-1.5.0-r2.ebuild 1249 SHA256 ba2ff5a812a333f23e0ce3630707540b7a54b6599ba6da5cdc4b919a1a449964 SHA512 da75a33596b521367f736c6762e1fd8f7b30d7de2db6f627c107f6ba84f6c5b9e5b15b80bdfc4ce5f9b096bf881598322c332c4c8f9552e87a8425e4ce7d954d WHIRLPOOL 5e527fec7a7e9666cdfe913f4b39ede4df30f261f7053fe215007f66a931af9dd9fec8f0bd628dee440e229ec8922653965a597613f8225ccd3a097578dd12da
+EBUILD libgcrypt-1.5.0-r2.ebuild 1293 SHA256 c9eedf9269e2e89e630d3c23493d3d05e04bc49182df6fcf3202d21a0928bd19 SHA512 89491cea1e47480ccac3b60c3cb0db0f81a254a448ce7329e88098dc297cb88c3d821f35474d9d9b7a4e698eee77ff0bd7eb01f4b900880342947f9c3e753958 WHIRLPOOL 83c8643d485594a684c9aa15b701e1981609b768d3131616e9468fe5f66188a845148b04e225de099f681380098cf4ea8faeede98f65f86c2424dfb60ea9d76f
 EBUILD libgcrypt-1.5.0.ebuild 1152 SHA256 e6aa83ade326e53949c053da8cef23aa85b74a16a19b1b6da03a5ede6b83659f SHA512 f77c202e8500b7b10bee50ce9620bf8ac3b2ae6533869ce3686b4b44ce7adaff16312b57ce3cbf6d0d6409d137c97e1ecce9260de18d62dbf7f1289877139c89 WHIRLPOOL af21e0f6cb113c302176980e3875a22ffbe5d1c408c8c01421cc2a66f4ae89322e03498aef6e57b02ae865f073872b3b1a87874b910d55b415c695b106e77b7d
-MISC ChangeLog 23444 SHA256 111a65b4e6846391f75b79cfa4421b85b34d4ed4c636d9f0ab8b38da492d5c3a SHA512 2c7517e01f8b7c79ffe78cf99e9729e4e5f32070803b60d8813a0d25911ff71b25ff51611c983ecb56f91403c6ccc3bc0524ce0d36fb89cafad6d07840deb078 WHIRLPOOL f8329497cca03f3fff67b82137105f67145f2392e72c156bba871b8f3b103e56c06c6d46a94c66b1b5a4ce64575017ee4f9c0fd53cbb47b77467c1166203ecd6
+MISC ChangeLog 23601 SHA256 fca1c65a354cdef298ffb2e361b6ab5856290cf6cc87860e92a07e213428fe6a SHA512 877d567a41149acd17040f264af0148f141f7a7f73afe2d64458aaea9dc18bb168adfec2f9a866a8111e802977fe9eb1686892e3494f3cbe1616c840e5f7da8d WHIRLPOOL b1249f29c091ddc321f3f5d9a1328dbb1a7f39b81d2631f337cb6b50a3bc09b8602da07a0c35614cfb802699eb7720568c3f93f4ae2e6714fa53d87a48f95a86
 MISC metadata.xml 160 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 SHA512 bfec8d424a118209f298dd88f7073aaaf6e1ad49f67a441817313a6fa525a0d228241dfb1ccd8dae45e1192db9712b1d5e9cf053f9f398eff5c17089373e7104 WHIRLPOOL 47a9e0b778a140714a565acf9db6bd59e11732af1f4cbb86af0beb36a8a9d77a29f0a875aa24537387ffe6e3143724a59cc60a0d93cf7870fd47e511d17c3de5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAxG2YACgkQuQc30/atMkDwYwCfbJS2HhNLq83mQ5ijSDu5hcng
-NCgAoMJ/pF1Lp1gZ+Rj4mJKYtfHL9CUc
-=HuS9
+iQIcBAEBCAAGBQJQX40CAAoJELEHsLL7fEFW5RcP/Rge0FUQWpHx0awCmsKe/3bf
+KnCdXZeX+mdpTBkGlzlzwEjj0HEZsPz5ef9CD7UBIZHTZGys3T7gv0iDWx5jtAO/
+PvISlnNPNHhN+HRjOZaNg2nkM6c0n6TNKb+Po4sekCI2qjEuQe0voao3y0kj7JlL
+ufLcUmMaqZcOw3sQc5VFsFyS16hpqZpPfF7Dx4ZxyqmO1B8deTS2NxrAFMfGts8V
+1zqkZayIWfd8w/WjAoU7iClMl8KuuACJPGpYmqcMw4vI6BDiwLi32FcUKkrCwLJ4
+DU8ZvessF1+2W2uku+/PjT34LANT7Mr/c8c/7b1Po/x005hZ6V/FRqcxxNY4YCby
+mx7jtCN5NuneLOB3uxaiqfjhG/AVTPe2nQrH/dKkbPrDuFWwANfBUgGzPYGEqSZP
+kG24+TjoyI7cGmHzbgw5LVdx+xASMnsbiBxm0GfnhutJ5iOgJA5r+KWV5dN+MJg7
+TRrK3m+dJe1H9NTI3L0MfW+H7YuHCp7quICxpuFvKirTN1DZugvN8aEyQokxB72f
+LNNPz6m//WdVrZ3WesDtOHMMWA7iSwwRi/5kBGgyGRhNKqZyVydnt025DqI+vLdj
+TyzzoZ8MpyM8iqphtAYLgjHNQ+o4nxJ1EN18RovsgVk0U0VbqLs6fNy6qtBx7i15
+dgPaau5wZTaOw6Tw1cTp
+=jkyt
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch
new file mode 100644
index 000000000000..5d39346844bf
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch
@@ -0,0 +1,10 @@
+http://lists.gnupg.org/pipermail/gcrypt-devel/2012-September/001979.html
+https://bugs.gentoo.org/427726
+
+--- mpi/amd64/mpi-asm-defs.h
++++ mpi/amd64/mpi-asm-defs.h
+@@ -0,0 +1,4 @@
++/* This file defines some basic constants for the MPI machinery.  We
++ * need to define the types on a per-CPU basis, so it is done with
++ * this file here.  */
++#define BYTES_PER_MPI_LIMB 8
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
index ff28463affa9..bc63d5016919 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.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/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.9 2012/08/19 16:59:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.10 2012/09/23 22:28:11 vapier Exp $
 
 EAPI="4"
 
@@ -24,6 +24,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-uscore.patch
+	epatch "${FILESDIR}"/${PN}-1.5.0-x32.patch
 	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
 	epatch "${WORKDIR}"/${P}-idea.patch
 	eautoreconf