Fixes from upstream for building with gcc-4 #150579 by David Pyke.

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 62 insertions, 13 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 679d76bdbfcb..2e8d4639cad3 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.31 2006/10/16 04:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.32 2006/10/16 05:31:06 vapier Exp $
+
+  16 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/beecrypt-4.1.2-gcc4.patch, beecrypt-4.1.2-r1.ebuild:
+  Fixes from upstream for building with gcc-4 #150579 by David Pyke.
 
   16 Oct 2006; Mike Frysinger <vapier@gentoo.org>
   files/beecrypt-4.1.2-configure-ac.patch, beecrypt-4.1.2-r1.ebuild:
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index af3366574888..29bb70058bc8 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -25,6 +25,10 @@ AUX beecrypt-4.1.2-custom-cflags.patch 1923 RMD160 29270a2fd07996a2362ff3344a959
 MD5 d9df55b27ad44b732ee01ee84bca5919 files/beecrypt-4.1.2-custom-cflags.patch 1923
 RMD160 29270a2fd07996a2362ff3344a95929385b119d7 files/beecrypt-4.1.2-custom-cflags.patch 1923
 SHA256 474b2c61885e68af31e489adadb0130c47437022b05050c9a2c7fe98e4444cb3 files/beecrypt-4.1.2-custom-cflags.patch 1923
+AUX beecrypt-4.1.2-gcc4.patch 1163 RMD160 f3af93f4491752afa870d29224e0ecda6b17622a SHA1 93a484a44cc6e9d8ae4ba3bbb774d04d9aaec0d2 SHA256 8fc8a2c652fdce419327e5bc176bc0abcc42d69588a136459cb915dc1950b4ad
+MD5 c51e24fe71df262f6775083a94d03ee4 files/beecrypt-4.1.2-gcc4.patch 1163
+RMD160 f3af93f4491752afa870d29224e0ecda6b17622a files/beecrypt-4.1.2-gcc4.patch 1163
+SHA256 8fc8a2c652fdce419327e5bc176bc0abcc42d69588a136459cb915dc1950b4ad files/beecrypt-4.1.2-gcc4.patch 1163
 AUX beecrypt-4.1.2-python-Makefile-am.patch 311 RMD160 dd271f87a2cff9042007e69e1238513e8c4fffa0 SHA1 b7b262aa484925ef57ed1869c2a548c564810d96 SHA256 fba9950605602ae777c540c7a0c07d90547cb26edfa36df481c767be11d2c9b3
 MD5 9de86bdf34c8d29393d14a80c299fa14 files/beecrypt-4.1.2-python-Makefile-am.patch 311
 RMD160 dd271f87a2cff9042007e69e1238513e8c4fffa0 files/beecrypt-4.1.2-python-Makefile-am.patch 311
@@ -43,18 +47,18 @@ EBUILD beecrypt-3.1.0-r2.ebuild 1723 RMD160 8d23c514408cb5447401b94a65b8834c8792
 MD5 b6c457c06f2f7babce8779dc33405e21 beecrypt-3.1.0-r2.ebuild 1723
 RMD160 8d23c514408cb5447401b94a65b8834c87922187 beecrypt-3.1.0-r2.ebuild 1723
 SHA256 ce7a18ed0154803578ba50d9964add3573367af04c1e55905ed43815aa417dc8 beecrypt-3.1.0-r2.ebuild 1723
-EBUILD beecrypt-4.1.2-r1.ebuild 2068 RMD160 49e6360be3e8498b0fa5eefefab12cad5c293909 SHA1 ebdaff314c1d325f90a7f1de8854c699d857b705 SHA256 74e3f7d7df7eb978a91b59e8ce7cc01e4b2ea51dfc2762450962191dc6b023b9
-MD5 28828bf231665e685e1ce9d1b0542a5e beecrypt-4.1.2-r1.ebuild 2068
-RMD160 49e6360be3e8498b0fa5eefefab12cad5c293909 beecrypt-4.1.2-r1.ebuild 2068
-SHA256 74e3f7d7df7eb978a91b59e8ce7cc01e4b2ea51dfc2762450962191dc6b023b9 beecrypt-4.1.2-r1.ebuild 2068
+EBUILD beecrypt-4.1.2-r1.ebuild 2106 RMD160 8d9419f5c166b20923bcd3518e11d8cbc2a61ae7 SHA1 c1e4bdfcf031d0d949d781eb4007d1cf7f25b9c7 SHA256 d817aec6945fdb0edb6e5d93165541750a0ec8af7c02ff1dfa7c67b17ed3cec4
+MD5 c26bc895c0cab4bd4cccc51249b8fbfe beecrypt-4.1.2-r1.ebuild 2106
+RMD160 8d9419f5c166b20923bcd3518e11d8cbc2a61ae7 beecrypt-4.1.2-r1.ebuild 2106
+SHA256 d817aec6945fdb0edb6e5d93165541750a0ec8af7c02ff1dfa7c67b17ed3cec4 beecrypt-4.1.2-r1.ebuild 2106
 EBUILD beecrypt-4.1.2.ebuild 1571 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 SHA1 2b15ccdc2de2fb69d131c85a179f0e3cfa93a941 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e
 MD5 58efa38295c5d97f1bac7465fa9b87de beecrypt-4.1.2.ebuild 1571
 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 beecrypt-4.1.2.ebuild 1571
 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e beecrypt-4.1.2.ebuild 1571
-MISC ChangeLog 5116 RMD160 601f55ac71ec96a4f3fd9949886ead6315fe0844 SHA1 6ddd90c4ea9c45d29b298c426e78013e4c3c38a3 SHA256 ba34a7f35955f40eb7fb512ce3e0ce38d6145390ea3534383dd0cfe6f462b025
-MD5 2f396e92511685796d044067d45c08d0 ChangeLog 5116
-RMD160 601f55ac71ec96a4f3fd9949886ead6315fe0844 ChangeLog 5116
-SHA256 ba34a7f35955f40eb7fb512ce3e0ce38d6145390ea3534383dd0cfe6f462b025 ChangeLog 5116
+MISC ChangeLog 5298 RMD160 eb15dcfe16900f0e9441164a64f9a4e2f250c7e2 SHA1 b4f938f2145a2f94d91b970672366b8bbfe96214 SHA256 9f5d633f36cc6a3d165a3ea1d2a5d73803ed678f8db7dc63cb5db48ddacdece4
+MD5 1ba8a5a684ab5346e5d6c62b323ebadc ChangeLog 5298
+RMD160 eb15dcfe16900f0e9441164a64f9a4e2f250c7e2 ChangeLog 5298
+SHA256 9f5d633f36cc6a3d165a3ea1d2a5d73803ed678f8db7dc63cb5db48ddacdece4 ChangeLog 5298
 MISC metadata.xml 441 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c SHA1 0061a112b5252de7a4803ecb7b201e48be7dc5b7 SHA256 5675e81fe2ef6bb6949439f5c88e041c614a2ad8c554c685e745a457c116279d
 MD5 ca48fb502dfc8284bdf1dad98f1f1f93 metadata.xml 441
 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c metadata.xml 441
@@ -74,7 +78,7 @@ SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFMwvIamhnQswr0vIRAlTTAJ9Fr0yZH0Y2vpvBlM4sPMga+crElQCfRY5l
-cQYi0d8p1kY7svq2dSQ8Wvg=
-=6PEw
+iD8DBQFFMxklamhnQswr0vIRAid7AKCkm747WhQE5tNkVD2aIey2U6Ej4gCfWZMx
+bJK6f1yIoZsGg00I9bDsKjo=
+=q/8f
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
index 807a731c36a4..4f83aa6236b9 100644
--- a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.3 2006/10/16 04:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.4 2006/10/16 05:31:06 vapier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -36,6 +36,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-python-Makefile-am.patch
 	epatch "${FILESDIR}"/${P}-python-debug-py-c.patch
 	epatch "${FILESDIR}"/${P}-configure-ac.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 	eautoreconf
 }
 
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch
new file mode 100644
index 000000000000..69cdac07b2cf
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch
@@ -0,0 +1,40 @@
+fixes from upstream
+
+http://bugs.gentoo.org/150579
+
+--- beecrypt/c++/security/Security.h
++++ beecrypt/c++/security/Security.h
+@@ -59,16 +59,16 @@
+ 		{
+ 			friend class AlgorithmParameterGenerator;
+ 			friend class AlgorithmParameters;
+-			friend class CertificateFactory;
+-			friend class CertPathValidator;
+-			friend class Cipher;
+-			friend class KeyAgreement;
++			friend class ::CertificateFactory;
++			friend class ::CertPathValidator;
++			friend class ::Cipher;
++			friend class ::KeyAgreement;
+ 			friend class KeyFactory;
+ 			friend class KeyPairGenerator;
+ 			friend class KeyStore;
+-			friend class Mac;
++			friend class ::Mac;
+ 			friend class MessageDigest;
+-			friend class SecretKeyFactory;
++			friend class ::SecretKeyFactory;
+ 			friend class SecureRandom;
+ 			friend class Signature;
+ 
+--- beecrypt/c++/beeyond/BeeCertificate.h
++++ beecrypt/c++/beeyond/BeeCertificate.h
+@@ -61,7 +61,7 @@
+ 		 */
+ 		class BEECRYPTCXXAPI BeeCertificate : public beecrypt::security::cert::Certificate, public beecrypt::lang::Cloneable
+ 		{
+-			friend class BeeCertificateFactory;
++			friend class ::BeeCertificateFactory;
+ 
+ 		public:
+ 			static const Date FOREVER;