Fix OpenSSL >= 1.0.0 detection (broken m4/tls.m4 check) wrt #328027.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 77c1e8bcc1df38a5fbb23676bd18a3cb8431e793..d3e9cf9a476d9db05d5d21f49018b877e7c952f7 100644 (file)
--- a/dev-libs/ace/ChangeLog
+++ b/dev-libs/ace/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/ace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.59 2010/06/02 06:43:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.60 2010/07/13 00:19:11 ssuominen Exp $
+
+  13 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> ace-5.7.2.ebuild:
+  Fix OpenSSL >= 1.0.0 detection (broken m4/tls.m4 check) wrt #328027.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove tantive from metadata.xml (#200343)

diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index a166e0fa240fb8aef4f999596ba734b749baeae1..5dc9f01ccc41d37a220b94c43054049a8880f300 100644 (file)
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ace-missing-refcountable-header.patch 658 RMD160 d616b07612bce1aa3a404e363e31012e22c8caab SHA1 9d83df1adc108f05348c65d15bdd3781a07d6d89 SHA256 002c4c9ad8ed363c6e61f6497a91c3a8eaeec3feb24d87d4bc9ac89ac2c72150
 DIST ACE+TAO+CIAO-5.6.1.tar.bz2 24590534 RMD160 2ab740d3efd3b0b804ccec9c5af4ac8762afc237 SHA1 3b1ed3e4b5f8b52041af78a3179396ff9dd907c0 SHA256 3c8b70de975189abbdd0f27dec98b14b11d972185763aa3720ef1fe444c437b5
 DIST ACE+TAO+CIAO-5.6.5.tar.bz2 28235274 RMD160 bcc2cb8f851d6c9d346ea111a9eecf8f8b14f802 SHA1 2dec77f253401f5ea33019da16408e42232725fd SHA256 8db1ec565bb2ca80354a740bbce18f4c5e41af888a79e7f207b0cd9f9636f571
@@ -18,13 +15,6 @@ EBUILD ace-5.6.1.ebuild 2347 RMD160 90ce097e59facbe40ed2930ccb97d8d6357494c9 SHA
 EBUILD ace-5.6.5-r1.ebuild 2363 RMD160 dbae1eae59d60f484dfc7d132f05591e850c03a4 SHA1 f06fa6c5e7e35a41e6b3d775bacfda463cc50c57 SHA256 7a841a7f6241444f3d287e49b034cdae09de705da3c55c235be48fe4b02eb490
 EBUILD ace-5.6.5-r2.ebuild 2454 RMD160 982fade1554a819f66c4b9495c6138ca795c8592 SHA1 dce5a10d756ec889ffde9dcb91918d07c008a9d2 SHA256 5aec661f714cb7bb7f819f03cb77ef1005b9d12158342b6e49fa8b0486b0df57
 EBUILD ace-5.6.5.ebuild 2348 RMD160 a68961662187c132a8f2f51531b93485d8dbde00 SHA1 a65014891df825dcd3ccb18358a6a3b4359813f1 SHA256 f04a2be5525bd184fc47ac3fb0a721ed706aba23201a50ba1c08cbaa5f51bca4
-EBUILD ace-5.7.2.ebuild 2266 RMD160 618a43e0a855e7906eb9981e0ca27e3533312e55 SHA1 04bbb89fc12404f84591c61b43601b2ed7ad50a1 SHA256 d38f1ecec9b1fe4c1bc25dfaa3348baedee871f8ad3185c60dbdc1b3a186e7ea
-MISC ChangeLog 7697 RMD160 23952f0e40bd96c3915f50f218f5b9ecd1369b23 SHA1 7b5e4ff291a0d6f38f9fec076989cbe8658fa07f SHA256 2b305408d773d6e0b9daa5ee78aa5feb16046a8d03028286b5f0b1807418a416
+EBUILD ace-5.7.2.ebuild 2482 RMD160 461c74d3718c2d990fba5fb5bc30457907819a0c SHA1 460fe6698e39dccea4dbf3c0713d3fad14eb0932 SHA256 0ae6aea597a94d6705c32f9ab84c8a04fdccf01b00c1d6d0f0ebf36db886f4a0
+MISC ChangeLog 7846 RMD160 cb3351aa77b9b1c25ea6b769b1ea86217c996066 SHA1 7655f54608e7bb532e5007cbef3f041c3b788a39 SHA256 e700339c443de07d2d80b7f54089ca9fe0628f118275f9e1d0b65787c0c3d233
 MISC metadata.xml 569 RMD160 2c7cd24b076fbf4e3d13e35eeeb78b1061257ad0 SHA1 5dde5614d3a30cd89d3f6150cdba6954db1333fa SHA256 d99d11b50e070cf3c23580fd85a1a364daa940c1dc702495bdebfb16b66dec87
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwF/Y4ACgkQV3J2n04Eauxi7QCeOVARujI3cSrJCwd6oWX7Nj1M
-5mwAoIvK1V0XTNJLPnanlL4wV4hBlqqF
-=WV1+
------END PGP SIGNATURE-----

diff --git a/dev-libs/ace/ace-5.7.2.ebuild b/dev-libs/ace/ace-5.7.2.ebuild
index 43df534631fb63814ec923fb102589006993a6bf..ce6791cee583734371b54e479e454dd4a963c6a3 100644 (file)
--- a/dev-libs/ace/ace-5.7.2.ebuild
+++ b/dev-libs/ace/ace-5.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.7.2.ebuild,v 1.1 2009/09/01 09:36:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.7.2.ebuild,v 1.2 2010/07/13 00:19:11 ssuominen Exp $
 
 inherit toolchain-funcs eutils
 
@@ -26,6 +26,15 @@ DEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}/ACE_wrappers"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       # Let's avoid autotools. http://bugs.gentoo.org/328027.
+       if has_version ">=dev-libs/openssl-1.0.0"; then
+               sed -i -e 's:SSL_METHOD:const SSL_METHOD:' configure || die
+       fi
+}
+
 src_compile() {
        export ACE_ROOT="${S}"
        mkdir build