Fix build with gcc 4.7, bug 412353 by <AlphatPC@gmail.com>.

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

4 files changed, 94 insertions, 21 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 64bb1cab27a0..a24a7838d2c4 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.92 2011/09/14 19:11:21 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.93 2012/04/17 17:13:09 pesa Exp $
+
+  17 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qca-2.0.3+gcc-4.7.patch, qca-2.0.3.ebuild:
+  Fix build with gcc 4.7, bug 412353 by <AlphatPC@gmail.com>.
 
   14 Sep 2011; Fabian Groffen <grobian@gentoo.org> qca-2.0.3.ebuild:
   Marked ~ppc-macos, bug #382057
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index c8e8d6b56e47..4d4a0b64f41b 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qca-2.0.2-pcfilespath.patch 409 RMD160 65368cb474f2dd1d79b0c9d00424831acd777465 SHA1 a2defc2ae7d3dc31986f89cb8ec2760df85cb208 SHA256 d4d276c13f08bc538b79779aba49126b310df5c97f95b2c7010de050c880d695
+AUX qca-2.0.3+gcc-4.7.patch 2536 RMD160 f684d52c3d49578503eca45882713a057c3b49d9 SHA1 c4198477258445de61ff0d0a3c46570097d0730f SHA256 b4e43ee16ee246129c415266d59d916f8268024730c7a6b758d0ff37b7d4786d
 DIST qca-2.0.3.tar.bz2 4530731 RMD160 333cfdce91fedfaec09c205528de52d7b569c521 SHA1 9c868b05b81dce172c41b813de4de68554154c60 SHA256 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f
-EBUILD qca-2.0.3.ebuild 2032 RMD160 042d63575a48d42e0bf3e14077f943636edf7b4c SHA1 5cd994d4842f3217e2c61c7ff241813ef9f62992 SHA256 e820eec08b050d8a1a889710ed899bf950dd4d93b1ec1a940d6cd289fd1f0378
-MISC ChangeLog 11226 RMD160 ffd7f9c3aef10d8bb0944519703652ca300012e4 SHA1 62cfea91a245a8463a689835839f4f08b02428ba SHA256 3f02c0a649c0e4466f7e7922c1d79833b315422a22b8574d0495266c050fd8f6
+EBUILD qca-2.0.3.ebuild 2039 RMD160 ff52fcbda6f25562a0400acfebecf78f8a9f98c5 SHA1 03d0bfaed82f38b36a2a4767baa45b912c4a7ce4 SHA256 4737813dbaa6a339ab5e081e6f45f5da94d5b83398b3f9f3207c13b34ad390f5
+MISC ChangeLog 11388 RMD160 9ecb320dc00a350267866bbd6a3b218b3aab4829 SHA1 625226a4c28a35d89db4bd40672b6aaf8fa9f0b7 SHA256 c625ea6a4b8e46dab1fa554f46630697bdef942c7816d2a6efb4ac11b60fca37
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk5w/F4ACgkQX3X2B8XHTok46QCdG9jOYcgXGEXM54E7DrC6BRx+
-R0cAnAuMGSnhiYt/oizJgNYBUNZskMwG
-=vI6n
+iQIcBAEBCgAGBQJPjaSqAAoJENXLsxwXqFxysIEP/jOz4kIqg7qST6t2QLwiTwbJ
+6X+KnYi0eqReTHJahzVFY5sfKxZaLt3UxFEj1rCJ+MZmodlMy6kl5678pR5SsEdX
+jsAXs9qXmJ9BiQXZU+vmMmt9d/EJRoX50v/5SJ4aXkQ1sQ+VbYihLaQeHRCpoQIK
+vPh/Y9/2K0KFo2jDefZK/F32Ot39C/7b/EYOZh+HWPjByeEb6PFIs/0lhN+kUUQ5
+ZKUOsB172QhyU4oJaGmEM/qGUcd7rP9qoqGaijCTXZuLfznPqFyxCPSG8/6LbVg4
+HGxpKqTB6tJxrpKNb+nO5rIQrG8//uqQRwvcSV9G395MNugi5b9cA1VC0jaw07FZ
+uEccjzoa0kdjc1xIu+0xBzq+VrET6XEDEQBPNthvC0OGST4VbxUMAL3GnHNKPYTA
+mOnnJsv1QsYNSrGkckQpkbhf5fLnx5ba4Fo5/ufUCzEr+LkxAJwiNuEzNrHsW+Ax
+lSoKk2zNZubOdd2CrgvBrNqq6QhhCf3zRgGktPsWyzijqvOaHKk/SeRKF2f1aRuh
+clNyUbZAvlwfi2/ej0E4mx9ozZJBAdUZxv7PKNPUNO5u6NKhFVBJtJ+jiajCmg5/
+1RmPp5QuUf0ojvglTvVPFCx/LI++k+hPNn86cAzT831IARwmeiIyz1IYWMLWzICg
+5iWvjFszOoYcGmD2RAWP
+=u0aN
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch b/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch
new file mode 100644
index 000000000000..1752dff910ff
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch
@@ -0,0 +1,59 @@
+--- trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h	2012/01/14 16:09:19	1273507
++++ trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h	2012/01/14 17:12:15	1273508
+@@ -191,15 +191,15 @@
+    {
+    public:
+       MemoryVector<T>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
+       MemoryVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(false); set(in, n); }
++         { MemoryRegion<T>::init(false); this->set(in, n); }
+       MemoryVector(const MemoryRegion<T>& in)
+-         { MemoryRegion<T>::init(false); set(in); }
++         { MemoryRegion<T>::init(false); this->set(in); }
+       MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+-         { MemoryRegion<T>::init(false); set(in1); append(in2); }
++         { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
+    };
+ 
+ /*************************************************
+@@ -210,15 +210,15 @@
+    {
+    public:
+       SecureVector<T>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
+       SecureVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(true); set(in, n); }
++         { MemoryRegion<T>::init(true); this->set(in, n); }
+       SecureVector(const MemoryRegion<T>& in)
+-         { MemoryRegion<T>::init(true); set(in); }
++         { MemoryRegion<T>::init(true); this->set(in); }
+       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+-         { MemoryRegion<T>::init(true); set(in1); append(in2); }
++         { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
+    };
+ 
+ /*************************************************
+@@ -229,14 +229,14 @@
+    {
+    public:
+       SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       SecureBuffer() { MemoryRegion<T>::init(true, L); }
+       SecureBuffer(const T in[], u32bit n)
+          { MemoryRegion<T>::init(true, L); copy(in, n); }
+    private:
+       SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+    };
+ 
+ }
diff --git a/app-crypt/qca/qca-2.0.3.ebuild b/app-crypt/qca/qca-2.0.3.ebuild
index e65264a6d3ce..23cc6ceb02bc 100644
--- a/app-crypt/qca/qca-2.0.3.ebuild
+++ b/app-crypt/qca/qca-2.0.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.3.ebuild,v 1.9 2011/09/14 19:11:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.3.ebuild,v 1.10 2012/04/17 17:13:09 pesa Exp $
 
 EAPI="3"
+
 inherit eutils multilib qt4-r2
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
@@ -20,26 +21,24 @@ RDEPEND="${DEPEND}
 	!<app-crypt/qca-1.0-r3:0"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch
+	epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch \
+		"${FILESDIR}"/${P}+gcc-4.7.patch
 
 	if use aqua; then
-		sed -i \
-		-e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
-		src/src.pro || die "Sed failed."
+		sed -i -e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
+			src/src.pro || die
 	fi
 }
 
 src_configure() {
-	_libdir=$(get_libdir)
-
 	# Ensure proper rpath
-	export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/${_libdir}/qca2"
+	export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
 
 	ABI= ./configure \
 		--prefix="${EPREFIX}"/usr \
 		--qtdir="${EPREFIX}"/usr \
 		--includedir="${EPREFIX}"/usr/include/qca2 \
-		--libdir="${EPREFIX}"/usr/${_libdir}/qca2 \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/qca2 \
 		--certstore-path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
 		--no-separate-debug-info \
 		--disable-tests \
@@ -55,7 +54,7 @@ src_install() {
 	dodoc README TODO || die
 
 	cat <<-EOF > "${WORKDIR}"/44qca2
-	LDPATH="${EPREFIX}/usr/${_libdir}/qca2"
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
 	EOF
 	doenvd "${WORKDIR}"/44qca2 || die
 
@@ -69,7 +68,7 @@ src_install() {
 	fi
 
 	# add the proper rpath for packages that do CONFIG += crypto
-	echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/${_libdir}/qca2\"" >> \
+	echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/$(get_libdir)/qca2\"" >> \
 		"${D%/}${EPREFIX}/usr/share/qt4/mkspecs/features/crypto.prf" \
 		|| die "failed to add rpath to crypto.prf"
 }