From daf2c05c93adc42a59e50b2c873d7d1fbb57e6a0 Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Fri, 3 Apr 2015 13:04:13 +0000
Subject: [PATCH] Add append-flags -D_REENTRANT wrt bug 545376

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
---
 sys-cluster/galera/ChangeLog            |  5 ++++-
 sys-cluster/galera/Manifest             | 30 ++++++++++++-------------
 sys-cluster/galera/galera-25.3.5.ebuild |  6 +++--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog
index fdbd108ea9be..f9003707d176 100644
--- a/sys-cluster/galera/ChangeLog
+++ b/sys-cluster/galera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/galera
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/ChangeLog,v 1.4 2015/03/24 18:32:11 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/ChangeLog,v 1.5 2015/04/03 13:04:03 grknight Exp $
+
+  03 Apr 2015; Brian Evans <grknight@gentoo.org> galera-25.3.5.ebuild:
+  Add append-flags -D_REENTRANT wrt bug 545376
 
 *galera-25.3.10 (24 Mar 2015)
 
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 30f71849e767..a3fe7c3ab871 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -8,23 +8,23 @@ AUX respect-flags.patch 1210 SHA256 3c0463df1ae23d219bd411f08a238f2eabb31f29ed8c
 DIST galera-25.3.10.tar.gz 2950372 SHA256 33a749f71e478d068982845524a44fe18d1c59c168e1fee8b92baca763982b2d SHA512 c08420b72e446c93645012ec04465c4cb65152bd3eaa840142fafdcb6945f76e77e2be00cf68930227656b78c25cd5ce36ebe823d6fcbcd320e6ae91b3b38a5c WHIRLPOOL 87a271f3e03de3da70cb302ff6559c70d65097b1b639b8ae1501afe0ef9328bc746ae828daac8cc5cbd4ef0f8cd861a72739d7154709f3122d7bb4e1f3ab57bd
 DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
 EBUILD galera-25.3.10.ebuild 1872 SHA256 b813b2ac350c4d88b7dfced377e5f1a3bbb913add1cf7631c249af515d7e38eb SHA512 a17b185317b62e1aa20e153ab7f5dc185e22c1fa91d3ede3668607c586d2002b573420f2d2b94f198249810b976f505a73083e2ac90455ca568d78d3aca67acd WHIRLPOOL edadc43fb340bdca7ea4bc06a62df5024b33d863ae816972304e25ade8564f9ea1f60442d963e2e6e566ce580bf61f4413d1b28f4d080088091d0d58cda9c8c8
-EBUILD galera-25.3.5.ebuild 1875 SHA256 8e93da2d19bd1c7c0d8df428a035f8f8a0a77f6f7256316875056a5219b833a9 SHA512 5f0ad64d7aa8a650d3f2c750e858d403ab4ef01e94c1d6c26a69e35623758e218aa3acfa8402ec7321a1ee0c8c7faf7d9a34134af51b7791cc5e6d6ff36e3b6b WHIRLPOOL 5013df52658954d93468d6c6a0b40f644d4e82c1329212bffadaeeb4f5ef7ed5a178b01dd21fb317d778bb168c9fd197fa7278d7b54f0154c4546e5b8a7b570e
-MISC ChangeLog 1003 SHA256 abc91b5b52dd2ca064a92031c5c5adf2da5842cf279dbcfcbcf97845455fd2d7 SHA512 2ef1d2bbf79c9d82f1c8feb9be3f8a2337f9cd78f9d1fd631fa22d9caaf5ab78ac831c07e1e6fe8071006f1f66ec928746b355843c92567faac4068ac1b4780c WHIRLPOOL 21aae8860cb5942144a0a4fbbbddcbabd3ba4093d8b483c15c07beb91b94f46055ebaef6f5abe1268ac66f41b93501220c0e4dd342c6133c24f1903a5fda4970
+EBUILD galera-25.3.5.ebuild 1965 SHA256 dfad21ed778902d7c9509b6ce2dd3cd0491e64afa390038598ef1994900efd52 SHA512 00b10de46b77356045c30c95bb6fee4ceaced01cfb55ceac72abc13d26699e23a39310a5d8d65d3eca02ff801d7e967395d83b07d52b1f9ebbd910fb8228e7ec WHIRLPOOL d9a87f2593d5d012a3c4144a353b8afe6866484a51930595d70fa2f8dab1abb53ae4e88b7dc78849c6c6b0aa6528e71e1b05169e1224925b709ae641d81d9783
+MISC ChangeLog 1122 SHA256 62b3692f0e17393e2cf27864c760fbf8ea591fc7e565b13a305c296cf6a84ddb SHA512 a960de102d6ddb0a6493a46f75c989f2d689f0693207a81d250c176dd27ab02e96b46211dd549074f1ffcd5e1db574f81ae7898b01a5e78d10862ab20c9d0629 WHIRLPOOL 61c403dbaf9c62c6c1137723a134cdea25cda40061fe2b76103d18676a9ce1dcbb21bd93186fb17db446427a21209dd94b85d400cedbbeb244becadb625cbb8e
 MISC metadata.xml 287 SHA256 a721bbdc105190e59b893dd6045954be5335317a3cb3ee04ade10ae84e91ed66 SHA512 b948f84f81ab15a82c332c9daecd73da57f7029c09a1779475dbd08667f90932ffb05507756d2daa7035dd949979f0233ddc15a68ccce01f05ad4fc57028d582 WHIRLPOOL 4a7f7eef9bf626325e0690d772b16e8816db42cac95f4df19e6ccde55beb36671246ea9e8878b904ce93b336f2d235a56d1df795bd059161694ac67f86193da7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVEa20AAoJENH3ge/59KO2cRgP/jeQaR9uLqaH7/n89jy5UK94
-gOk2rzY+oEvbzaNPB1U4xJR5ru5FBnifV+4MPU+5Ve4GSAu1/JQA0pkPgkcUTmZ4
-wvv0JO/A43NNA0sWwQkCJzvbFLCeUVf/BjWU/snJBsn8e8IupGfgSPJRseUL38ZP
-8fCllDg6tFlmxlPOOIVqIIFIJwBL9tjMdEdsLLdD087p3I6QW+kmKh/N4VF71FNC
-Aqm4rgtwPALztL3yitIncjd6WsYfp721Xhq7Sx9RkRdG0lWrHxzxOt8B8risPP6f
-Uv0MLXS5DqrfT8a9/zc8aobklfCcq4sNWnkFmn//CAHlgHV0idV3XtGLgjo8Vti0
-TM8MLngY6aXVR9lziooKwkAd4wAdJg/QrTUcCqeOcPHUC8bmG2ty2q8bkNcyK4Xw
-jsnchbnNGlctMzDXm8RyqUq/iCX61iqsnrFfvnQSfB/0snHzES0BSY1qTcESHNg4
-s209jscLbRlhtVUSBcYw2LJgJHbPEUz1E7SDxUKD6W7aQpBlTcXEa7c1XCRGZuYC
-j0gTc8XyiffxQD9sO+SIV8kLOpT2JGmDGIonbOpz3w9WNL6zFnvOLHBRDis/fLfJ
-9aesyxB3qGK1Y/s/PkXSmxMFYzY7NIJJmCXvvX87FQ6qV0QdGGBN/gP+5JXP+GOm
-DnUOlV+FP+3P99Ll35Tz
-=/veP
+iQIcBAEBCAAGBQJVHo/HAAoJENH3ge/59KO2b0YP/3Q80wDYSq7XV3knZmTuHrJ8
+nWvMeEdmdHbM/HIsQYeE0Hu3SYc9ishSPSDskXjOyT8mVahggVWeUlv/XXJ34c2C
+g+NZ42zR3VXZssmyCub3RmuYGPTQxlmrnwlSLdO2v7qQwHy/P5UFhHmFwdSv6Qfy
+FA91qxYQqrlBEz1B0A+/zl9IuNg9JD/xOy9n+jZG0FmPUojdGpC0yrxqxvvRTDsi
+iweLhy9x2yMyXy+524eELiAJDIS+9Cj+g+XeRgezFOMfh0bVh2IFKOtdW0i9ohfz
+Z9JVhLo5vX162rBmCJl1k6bik4y4Xk7J/6UHW7nMk4byZUZ6V2SDhKUZaK1/5L+5
+bExEJ73vJ9cvEx8NpgTz41rJTUrnmrx5M0o3D+tFhgPdgVBp67hcsv0QzQCEuYX6
+lpqMPh79ilLOsb0H0nI/h0XQa01RsofOaQjSl1n8FM0VpgLxPHQ4ZPLAwTJRDVSc
+SUnrDQcLuvZr9z1AvFvdliGmwTzT5Kslknc+j26pfhJl98Buu6Ie9+WOCA5Kb/uU
+ltarY9GchZnGxfB3sf+EHYLh2qxgY1uHUd15sD2sTlqcYLlAWPTF3XpHDWyw1gJG
+ej64WLUbEHn0NU/9K9o3LH6S8sq70uOK9pWGwxZAKUOGmwNru7dJQr2i64JZoMPP
+TbLCbAQpC4OqMa6X61/3
+=kcYJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.5.ebuild
index 461993f645e6..4246968aaa6d 100644
--- a/sys-cluster/galera/galera-25.3.5.ebuild
+++ b/sys-cluster/galera/galera-25.3.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.4 2015/03/24 18:32:11 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.5 2015/04/03 13:04:03 grknight Exp $
 
 EAPI=5
 
 MY_P="${PN}-${PV}-src"
 
-inherit scons-utils multilib toolchain-funcs base versionator eutils user
+inherit scons-utils multilib toolchain-funcs base versionator eutils user flag-o-matic
 DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
 HOMEPAGE="http://www.codership.org/"
 SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
@@ -61,6 +61,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug 545376 - some arches need this for pthread
+	append-flags -D_REENTRANT
 	tc-export CC CXX
 	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
 	# and -Wold-style-cast
-- 
2.26.2