From: Alon Bar-Lev <alonbl@gentoo.org>
Date: Thu, 30 Apr 2015 19:51:42 +0000 (+0000)
Subject: Fix gcc-5 qt issue, bug#547528, thanks to Mark Wright
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d3dbbab07299bc2a6ce83d10cce374091f4ddd3e;p=gentoo.git

Fix gcc-5 qt issue, bug#547528, thanks to Mark Wright

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51
---

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 3f54944bb4ac..382cb3107ff3 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.167 2015/03/31 17:18:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.168 2015/04/30 19:51:33 alonbl Exp $
+
+  30 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.9.0-r3.ebuild:
+  Fix gcc-5 qt issue, bug#547528, thanks to Mark Wright
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> pinentry-0.9.0.ebuild,
   pinentry-0.9.0-r1.ebuild, pinentry-0.9.0-r2.ebuild, pinentry-0.9.0-r3.ebuild:
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index d1ab74cf31f6..c7f60f61e61b 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -7,21 +7,14 @@ AUX pinentry-0.9.0-accessibility.patch 2587 SHA256 80adf350a7fa17ab7d60b36d1d373
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 EBUILD pinentry-0.9.0-r1.ebuild 2984 SHA256 5c8d235f29341909888aed86e394c0597391cbadf8a62f683e0843f416709c96 SHA512 d0b1eba241dee63b0bcb048fe7b73835727283a817d5a58f8390b6a9a4000d2f8532b045d3c284947a8e881f892c0a51d41276a0fe143d1271c11f171324986f WHIRLPOOL 5bf8814ec11ebc63a346db2368947aab5299489c07a93c80ec9097b366579194698f1637d63f0798941afaa330aa59bd6d13bd3b1be1eeba75e0ce8c38cbf14f
 EBUILD pinentry-0.9.0-r2.ebuild 3038 SHA256 8cecfa92b1cd7f5cf663c409bad542b1cf2024ab3bebbab19daf32ea632a9404 SHA512 ab76435473aa4e22248a051607c28c76e634c6398096839b6436f738e852cfe564403c6addde7d696c6d4d28592c9257e48092af992c4211d5e84f4b07f1b5cc WHIRLPOOL c86ce2526f7c912edb0d0c12028d18ec3878e55008d0a70a89e7bcf33d27bb9461ecd5d9b6605f10c643d20a1bc94a9959857fb995314c61473660c19e815ea4
-EBUILD pinentry-0.9.0-r3.ebuild 3049 SHA256 e67f51eafb58a8c7ca6cfc6d5564cf9077cd3dd6a56c570f5cdf432cc2220436 SHA512 a08bbdab51f233807a31725f1ed1e625419dca379fc9e6f4562fc60fea836fcfd97f00b251d68cda3dce8b3338a27f869b6433fbff1f08073ebf57f6089c0281 WHIRLPOOL 54a6cb79e9093f59e867844c33f92544e3dd0b2154a56e379b362c6ffe74f97dd6fb0a86278505cb9795733f6642c59ee9b25a30422b40bbe67bc0a80fd08ca0
+EBUILD pinentry-0.9.0-r3.ebuild 3136 SHA256 fbd8f91d0c28a92bc6923d19d0414f3c1b4035e6ce59eb7fdb153e5fe63f4551 SHA512 40c06d484b680507b18fdfdbbe17da15c1f41b9b7c87e8a3435b88d363f26d7ac8ec8d045c8e9f9988d110fe8ae826c249d5549974fe5bd60544718efadc4671 WHIRLPOOL 4053c9edbb0c036790166ba62ba25017eee419e43d5fadc2f561913d0a584fcb7d0b72e4da5e6a529316e06b23314bd88c17099e2fafe6c2b71a101129b7010f
 EBUILD pinentry-0.9.0.ebuild 2901 SHA256 e890a9acc471f6252fe4658e7f5b54a99525c06d5cf96681c3d0483dd9735829 SHA512 cfcd1733d69eebcf8e1c01d275edf7e50be76ddfe1fb439ebde80d7ae3f188d1f4feafa4fe471beb59a6d82aab4edf681a122f4acf74083b0e7816605faf0c7a WHIRLPOOL 5502e3e32b46d1aec265eeac5467772c95d7d404b5afe3e1a4b56333e8d581b4e8270b5cad44c66db99949229cbf6d3a38c12c7ca43174a87da6f3bc090775ff
-MISC ChangeLog 22463 SHA256 60169b1513c0032bd75d217b2bacb5c41a66a8bc74ca862e649de156d4983eec SHA512 e68de650d2e5ba13e031fa2cc6f7342e8205dcd7221d1fe3ba6bd7078dee104552d1877b57af57b2c74a7ced1fb315bb6846d65dc8477a6417099de4a9543901 WHIRLPOOL 430103e93b40b538d56c2286a803f5c63bc14087da80094bbcd0c3e28a8166e29344b81f54398f1e47b93f1462e62c49ff4ca21f0a65c7c7c7e23ec3501d36ce
+MISC ChangeLog 22597 SHA256 6767def011375f09153847f4937c692a992ecfff9c9b7c255dcf6f0385dd773e SHA512 8661948097446ff3655329c4029a14c7a7f6fd6a69b42475cffa9bbdb0ba64d43e4f83fb241b5efea0049577ad5451848534f33fb55529c2b638cd22f5f9292e WHIRLPOOL cbd383e2928758d60ac7bc62d0cbc92b3cf172166eeee6ff467bfff718e6af6730f08db11a88ca980a27dd781b63941c077c781999032f101cfc8cadc229b73d
 MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVGtbhAAoJEJQzkH1pP7W4mwIL/29InysRzxp1fSjHCQRvrACM
-+pc3ppeM6kcd+wIYtERfGJEZtof5Zsm3sYqC8I951q849w0WCylE9ipCNnpbmDJ9
-CYHKYc6CEizZgIKAFF7p0u02x98YCEoLD8zSIeBFCwLRMH4UsKf15jwFKOLmovJ2
-08BJuCtJSE1xnJ7jxNPLR1SuGqW9noGJi+JWhQCgAC0OsWOGuzWdgCRK/h2mdOeq
-6d09fDfjA/V1cHjG9WFCwCIcblkloezAIkz29YiQI8Pe0wMPs9ET3Lz5NpMyRahH
-tSDz4f87gLhuCKQBFDoAHYDqkToCRPWbzaS6Vw8EuTqocwFh3zagG1Mr5YyUIQrq
-vr26VVyVGhewDzCPb8KIOS87d1T3mrwi4X3FCGXPTdtShe2YUk9rTy784Zcju6Qe
-xBuy3NW4YKq5ip5SPuN/18PMiZKogtRX+r2YOmoMOLmOeMzdTpTzziDOyJaN/ds1
-9giMmJCnOfPJvT3Eiq+9VG+PLJsJYqqESibFArn9WQ==
-=VamJ
+iF0EAREIAAYFAlVCh8gACgkQXYk9GL8g3FHF9wD+PQKEFl74jBNjRvfs5EaUcLlS
+zD3Tz3S3yaskyCoSr3IA+JHFOd6kgNWnyRieY0+BgwOx/LlcK1oVX1BEck9ibDk=
+=ekMO
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
index c3e5f851417c..c0b153bf3fe9 100644
--- a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild,v 1.2 2015/03/31 17:18:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild,v 1.3 2015/04/30 19:51:33 alonbl Exp $
 
 EAPI=5
 
-inherit qmake-utils autotools multilib eutils flag-o-matic
+inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
@@ -53,6 +53,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
 
 	if [[ ${CHOST} == *-aix* ]] ; then
 		append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include"