From 613dd7761a342ed5b885e9db359a648212c56e82 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 16 Oct 2006 05:31:06 +0000 Subject: Fixes from upstream for building with gcc-4 #150579 by David Pyke. (Portage version: 2.1.2_pre2-r9) --- dev-libs/beecrypt/ChangeLog | 6 +++- dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild | 3 +- dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch | 40 +++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch 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 + +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 files/beecrypt-4.1.2-configure-ac.patch, beecrypt-4.1.2-r1.ebuild: 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; -- cgit v1.2.3-65-gdbad