Add patch to fix building with GCC 4.7 (fix bug #422553).

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

4 files changed, 29 insertions, 11 deletions

diff --git a/sys-cluster/gearmand/ChangeLog b/sys-cluster/gearmand/ChangeLog
index 56620a2c5d88..82f18f4c9797 100644
--- a/sys-cluster/gearmand/ChangeLog
+++ b/sys-cluster/gearmand/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/gearmand
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/ChangeLog,v 1.13 2012/06/04 06:56:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/ChangeLog,v 1.14 2012/06/21 14:43:30 flameeyes Exp $
+
+  21 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gearmand-0.33+gcc-4.7.patch, gearmand-0.33.ebuild:
+  Add patch to fix building with GCC 4.7 (fix bug #422553).
 
 *gearmand-0.33 (04 Jun 2012)
 
diff --git a/sys-cluster/gearmand/Manifest b/sys-cluster/gearmand/Manifest
index 790f1a6389c0..2fcb691834c5 100644
--- a/sys-cluster/gearmand/Manifest
+++ b/sys-cluster/gearmand/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gearmand-0.33+gcc-4.7.patch 334 RMD160 10903b714a6b862f7d32e2cd6307dc79106800a2 SHA1 ad881206e914bd203b7d0e0a757f426b26e967be SHA256 3f59c51ce930d68a2bce9be02f7f2f3a9b1ef7367fb428a4942a705e0fa9ab39
 AUX gearmand.conf.d 1542 RMD160 b903adca1eacbe87b69fdfe9f7b076666578a0bc SHA1 b863fadd280f7371159a958b20ec7c52fecd25be SHA256 a99bd1672091da3d4c2776225dacc497a5a9fb36ff8b34a464cd984cf584a29e
 AUX gearmand.init.d 3517 RMD160 f60730cb4378fb4856aeeae77f13232746efe390 SHA1 3d713da0239f33ee4f20b61e7b288f0d6efdb112 SHA256 07a8e9c1a8d4d859b9e4e3a6520989e7b690bf9dca1b630a2e171a8eee59ec6c
 AUX gearmand.init.d.2 3223 RMD160 791ba36cffed1fcae0396abef366bd8b744d0d7a SHA1 b3bf8d726cecbbec0b2f47bcab75fb9373d7d27c SHA256 69b7f8ab309e90a0fd37310ec9c5db3df69a278acd8efae88edaf6e45c256c2b
@@ -11,17 +12,17 @@ DIST gearmand-0.33.tar.gz 813193 RMD160 993c48fd7dc8fecefa052cd9a7d2e13945a58ee9
 EBUILD gearmand-0.12.ebuild 2829 RMD160 64a7771478883eacb7f2516d885697de2737ef55 SHA1 49e8a78b43aced70f290b3f7302f8e66d6e69296 SHA256 afed90f1bcf29471e8010fc5dff5e1b82ef5c3fc747d4223cb42176cd82d7abc
 EBUILD gearmand-0.14.ebuild 2664 RMD160 3b7787e3816ff8f02ddaccce03a02c0eb73e8dd6 SHA1 a8e036e3428ee1e9adcbd591ae1ca6c4ad22d718 SHA256 2ccc91f9c48ff07af1833dfa4cf16684065f2cd25d6b464de2539ae237f6b0ee
 EBUILD gearmand-0.24.ebuild 2591 RMD160 2055fad5e486c91a6692bf4cae389ee599c25afc SHA1 091c2d2b9c409be5d3b6d366fdc0f2f09acc0501 SHA256 26c654255ab04613843d28f800c469629d898857164f321f8716612bc6e33279
-EBUILD gearmand-0.33.ebuild 2437 RMD160 12de54cf349bab71db1c2f125154fab64b8e6cd2 SHA1 4c20eee176a8b6074287307202eecec93299faac SHA256 9fc9e42449568a1bb06aa31ba4c9dc515f15c52f0715a157d0212fd2b2519885
-MISC ChangeLog 2813 RMD160 2ba1f71aea80e43c0510819f8fd7ce8250faacc8 SHA1 4815021a750a320aea34e9cf4b8d395da87ba1c3 SHA256 a47f56e215bce6efb0b8b8ab5200495cad365b26340720366ac84b91df217c46
+EBUILD gearmand-0.33.ebuild 2478 RMD160 43360ddbe758cb0145e7f30eba0bf051d1128dea SHA1 5c576c7248df0d0dfb23f6761b85fc46612c048b SHA256 5f5d5cc8c7877a59863a3a67bcc35f2fd0711a5854f4d540569def4beda31d50
+MISC ChangeLog 2990 RMD160 50d1348ee499d73076172671c864ac94ba9e19ed SHA1 912cf0e12b9e2d1aa00d59524f9a10224cf6ffda SHA256 83121a3eda3f5d6895fc57c5c52357adc9a658dab5be1ced1e9b0d64cb50936c
 MISC metadata.xml 776 RMD160 827a7da1efa2749bb340482321e036ae0ff7275f SHA1 d884e5441ea57700493046901fdaafff5753223f SHA256 e52a8e23521a7a06df3e3c641e9ccc9e8086db7641d9be922e36d922c52b3561
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPzFwnAAoJEBzRPIrUMBNCIm4H/jGwRabBGiTS+/+ccdxMOlT3
-Wb5zgPETCurbZPFm4uaPOXj1IxBCwoOP+q/D6rNKgD/VKR2taUrAbN5t5tvjZ8T4
-1kuAvIu5mCww1ewNyZr48rIu7QljLX07FJ+gX+QvfS3OnkywuPiWIRzuPCV9BGEv
-ZS+bvO0aBwqiy6aSkVlKoz5z2mL5JQG5vc9SfeMBlw+WuIZp12OBBl0rK0v3edWu
-qeTX+Vgh2EqPf3IVIFzBUIuPytjFjYyOaDWOlcaiv9CIIR3j4n/zih/9ul9bIA2m
-0CYWG003jz8cICfaL79Klub1J1aj/ooCS/GzK6qi7xeDfcXHSsb4P4SEKL3lXDc=
-=LjOb
+iQEcBAEBAgAGBQJP4zM3AAoJEBzRPIrUMBNCVhsH/iwmMnPw6auvFsWnIOXBfGhb
+MVjTO39YHqCuX854dy85w3DJRRmBdGq8NPnKkCYiQpYVbD7+jOFOP22/sIAJ+LZe
+yY9B6O8nHmUTEhf1ASfUHLXHr7LWO30UhFvzc2mEhdPhstJdTICnyXaEqjyoRTM8
+xL9Oi89yz4ibx3snNPpiDm8UIVFKCuR4tz5QCLe+uwGjXeny85NS4ubyn1VECF3+
+42xuk8VTZbZxigdb/k6u5X21LIy3kL7gMFwSdwNe5Gij3Q1X04+iq+NaH1DLRvrP
+1Lun2rsds5AIFyzGqOdAJru0OAahGhaHwMIwJCe9H15mZSc/xXlWhGe/cSNf3wk=
+=ngYR
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/gearmand/files/gearmand-0.33+gcc-4.7.patch b/sys-cluster/gearmand/files/gearmand-0.33+gcc-4.7.patch
new file mode 100644
index 000000000000..459952313d99
--- /dev/null
+++ b/sys-cluster/gearmand/files/gearmand-0.33+gcc-4.7.patch
@@ -0,0 +1,12 @@
+Index: gearmand-0.33/util/logfile.cc
+===================================================================
+--- gearmand-0.33.orig/util/logfile.cc
++++ gearmand-0.33/util/logfile.cc
+@@ -49,6 +49,7 @@
+ #include <sstream>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <unistd.h>
+ 
+ namespace datadifferential {
+ namespace util {
diff --git a/sys-cluster/gearmand/gearmand-0.33.ebuild b/sys-cluster/gearmand/gearmand-0.33.ebuild
index 28360de4e481..eea8af24dd60 100644
--- a/sys-cluster/gearmand/gearmand-0.33.ebuild
+++ b/sys-cluster/gearmand/gearmand-0.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/gearmand-0.33.ebuild,v 1.1 2012/06/04 06:56:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/gearmand-0.33.ebuild,v 1.2 2012/06/21 14:43:30 flameeyes Exp $
 
 EAPI=4
 
@@ -30,6 +30,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}+gcc-4.7.patch
 	elibtoolize
 }