Use libtool's macro to identify whether to use underscores in names or not. Closes...

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

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index a047115763bc00eb07b3c795edcaea11973c1b4f..95fa68a5800fc5c2afda8ccc95188c5f70808e93 100644 (file)
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.149 2011/07/01 21:49:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.150 2011/09/22 14:19:48 flameeyes Exp $
+
+  22 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> libgcrypt-1.5.0.ebuild,
+  +files/libgcrypt-1.5.0-uscore.patch:
+  Use libtool's macro to identify whether to use underscores in names or not.
+  Closes bug #383865.
 
 *libgcrypt-1.5.0 (01 Jul 2011)
 

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index e745f0a26acc8aca2d63fd42d227968a23a800cb..8d2efab0da2de28b51edce21fe4ec9982f0c2f18 100644 (file)
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,31 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX libgcrypt-1.5.0-uscore.patch 981 RMD160 5993a5da17db5c557a141490144027d3d6ffef3d SHA1 c0559284fcd8885c38c9b5c2bd71eac028dc9b02 SHA256 4cbb34cebce02531b9b940494b78b7186b2fd05b802866d9ecb42d478e88e845
 AUX libgcrypt-1.5.0_beta1-ctr.patch 26861 RMD160 891afbd0bd0f0998114921eaf22c81e08357b7ad SHA1 d3d4faba496a0210e862bb23b009d7a82205164e SHA256 c45cba5c60a70d1ffd0595463fbb86cacf73662191b2faa5a643ac9f2600abb0
 DIST libgcrypt-1.4.6.tar.bz2 1151877 RMD160 d4d720c4bfe80f0799b2cbdbbb49d304e3195049 SHA1 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6 SHA256 3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85
 DIST libgcrypt-1.5.0-beta1.tar.bz2 1172939 RMD160 de82f94a1f7fd3b8460fa857edc4ab53ebb7cb27 SHA1 fbdbf8cde578835b4e492f34bd83f91deb97a2af SHA256 06842acbc36e3e8f427a56bd794f2e4f958f44e2ad2f41573db23a68ad050be4
 DIST libgcrypt-1.5.0.tar.bz2 1433506 RMD160 f01e8198dcc379ff2fa5e8d3ac39e7b32fc41dad SHA1 3e776d44375dc1a710560b98ae8437d5da6e32cf SHA256 4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa
 EBUILD libgcrypt-1.4.6-r1.ebuild 1167 RMD160 add8b9922a69f0c631b4c7d08049c8d379cc5e18 SHA1 92a52594ebf4524af911ad7b3e75fbd50df924f8 SHA256 0d9c4e0a4a0a96304499a18706fd9860c7001417eec1cee064feaee95d0abf89
 EBUILD libgcrypt-1.4.6.ebuild 1126 RMD160 bf89e3914988bbfb3e917441cf9a32945b950d71 SHA1 f8445a80a7916f4038860d122afc031fbc84f952 SHA256 e2bf303262e08375c82d10c921c642bfe9383bf3c5c64a7fd20e1d4e704ecf02
-EBUILD libgcrypt-1.5.0.ebuild 1052 RMD160 8b0961360a2b43485c25cdb50478cfc33516cf9e SHA1 c9d4344b3a6806b9f13e847eb96fe0472ff11026 SHA256 fdbab72979edcccce33ccb5bb4525798d73b89559f570782a8e7d5c3aed0d98c
+EBUILD libgcrypt-1.5.0.ebuild 1144 RMD160 c5323eaea9740c04a50bd1344187b030b9873b38 SHA1 e80154a6fac274bdf0c3247bcbddc5266dcdc076 SHA256 a82ce4bb1484fdb671e78fd8e1a24336442aebab447380e88656152955e51a0a
 EBUILD libgcrypt-1.5.0_beta1-r1.ebuild 1152 RMD160 d110e58e96c5b316c8f91855ef903c572cd842da SHA1 f63c83f1f515c2e5ff4ad4ce4f1cbbc29cd96e41 SHA256 489a81252e453a3791715ec3a79f0e3a74eba5a21a7ba3ea15ba12fec2ca5ab2
 EBUILD libgcrypt-1.5.0_beta1-r2.ebuild 1226 RMD160 430727c835ab5cccad7664c8b5e9b75a6cfd9811 SHA1 76bada7bb3af2d21dea7a2bf6997f436cd9f31f2 SHA256 8954703994a8dc3fbc6664a1e8bacbaf5c58ae48f2df02f6b672d4b5a7f3bfe7
-MISC ChangeLog 21474 RMD160 5570471285db1716c791c8a84bc87dbfcaa1714c SHA1 538bab761a50aa2ddf02f298b22c889189e47cb1 SHA256 790064c22fcf9f28d51123ebfdb925955cf104c71ae90eaf89d37c28c214c90c
+MISC ChangeLog 21695 RMD160 9ad1ba78323fc6b421ed062eb6e290670cf034f3 SHA1 7c5c783d6ff72f4909931cf64d34cd83d1b4b244 SHA256 18653123175220d9996232f4919fd28c5115218f5c573e6537d6d070e163f2e3
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJODkEEAAoJEPqDWhW0r/LCTQYP/jgldTXzPqGZUuZIw9QoeHux
-+FEQUcuPEAVLcJ7FyWSh2KMMi1ocby+8JJk+yRorxz5QYDnANUmMVFeuk3HHfmZV
-uYDX86Kbu1iff7RDYlP8vqkOU3Xd4pPzBGkK/pWAPU8OXu8l7EkuAI268ZF6RFze
-4cEtB1wS3BBR53BfKs1AWKLZcYcBihtZzxFGbfuvuL61+C7hwY5eXx6vTbP2kNAb
-67PQ+J1IdSiMi6LkFaG1xAz4tGv83RtJ8h9dYQU/VWZAI/udXjixSiaacMsMqtQg
-yGzy9BpaES3ENbnnxF990Tsy0Wix6i3QtG7cREtRFUdLvfHiwkKI75MFSgGuoyQ9
-hCu/4wU2iZ7lPAUnr8LApjWHnqmvTqO40/5/kbYyvOnTkXoSXPCmBE3cIvVJ+WvQ
-qIfwQjQ6AjyIjiwgsbKkpnePHRwoL7Ss+wE71CrmWA8yHf9HqTBeViPtrERWj2A1
-QfLa+ZJuvzSmMWabkhHMYCCZMfSwy1UhqjcvxUOWPLGqChIAoqa7Pg0+f4AQTdd0
-IBAe7h/J6csMmIE6vldD1Sc+w4/TQCdgcSryuHyskw5S/oma4NVMBAG8w1JTk/Ty
-FWL/AUqxTIfosKShBFoD3PwiysVYwj7OJf3kwr+fe+S706e1K5oosR6yvNM36GDX
-V1J2GUVRGuFFd1fxE+CS
-=IIK6
+iEYEARECAAYFAk57RAcACgkQAiZjviIA2XhOUwCdEWJl8JvckyWRLGcX+Wq2gv43
+vMIAoNRMRov07xqo/gTJcu9NAT8RDDov
+=+ZTN
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch
new file mode 100644 (file)
index 0000000..1d4f650
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch
@@ -0,0 +1,33 @@
+The version taken from GnuPG 1.4 assumes any cross-compiled package have
+prefixed underscores, which is not the case; by using libtool's own macro,
+we can avoid the whole issue.
+
+diff --git a/configure.ac b/configure.ac
+index ab160c3..6df49bf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -886,7 +886,7 @@ fi
+ #
+ # Setup assembler stuff.
+ #
+-GNUPG_SYS_SYMBOL_UNDERSCORE()
++LT_SYS_SYMBOL_USCORE
+ AC_ARG_ENABLE(mpi-path,
+               AC_HELP_STRING([--enable-mpi-path=EXTRA_PATH],
+             [prepend EXTRA_PATH to list of CPU specific optimizations]),
+diff --git a/mpi/config.links b/mpi/config.links
+index 7e910ee..9696828 100644
+--- a/mpi/config.links
++++ b/mpi/config.links
+@@ -291,7 +291,7 @@ fi
+ 
+ # Make sysdep.h
+ echo '/* created by config.links - do not edit */' >./mpi/sysdep.h
+-if test x$ac_cv_sys_symbol_underscore = xyes; then
++if test x$sys_symbol_underscore = xyes; then
+     cat <<EOF >>./mpi/sysdep.h
+ #if __STDC__
+ #define C_SYMBOL_NAME(name) _##name
+-- 
+1.7.6.1
+

diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild
index af35318b7c220bece56f61d40485746a59ebe4f1..51a6516dcb2a56748fdd2171c5d8c6e1ee40e53f 100644 (file)
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 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.ebuild,v 1.1 2011/07/01 21:49:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0.ebuild,v 1.2 2011/09/22 14:19:48 flameeyes Exp $
 
 EAPI="3"
 
+inherit autotools
+
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
@@ -17,6 +19,11 @@ IUSE="static-libs"
 RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-uscore.patch
+       eautoreconf
+}
+
 src_configure() {
        # --disable-padlock-support for bug #201917
        econf \