Fix build with GCC 4.7 (bug #424673).

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 54 insertions, 8 deletions

diff --git a/net-mail/mswatch/ChangeLog b/net-mail/mswatch/ChangeLog
index 91d0307156f9..57cb94ad84a0 100644
--- a/net-mail/mswatch/ChangeLog
+++ b/net-mail/mswatch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mswatch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mswatch/ChangeLog,v 1.4 2012/05/03 04:18:37 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mswatch/ChangeLog,v 1.5 2013/03/03 05:46:18 dirtyepic Exp $
+
+  03 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> mswatch-1.2.0.ebuild,
+  +files/mswatch-1.2.0-gcc47.patch:
+  Fix build with GCC 4.7 (bug #424673).
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> mswatch-1.2.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/net-mail/mswatch/Manifest b/net-mail/mswatch/Manifest
index a5f1a536663b..e54086ba8146 100644
--- a/net-mail/mswatch/Manifest
+++ b/net-mail/mswatch/Manifest
@@ -1,4 +1,19 @@
-DIST mswatch-1.2.0.tar.gz 434986 RMD160 60bf61a3447c52c024b3c51d7785332c3a5adfbc SHA1 ed13233a2bcb7495ee5fe257c3711cabc8f4e7d3 SHA256 2623514442237e11c91a06ab406d9594669ddb70fd1d55b84371ea613e8ac1a7
-EBUILD mswatch-1.2.0.ebuild 815 RMD160 d8bb1d41bac1e118f7dbdf53b592bc6dcdd0fc07 SHA1 d5d56370b8aebec814a48d5a18f38b7dd4c26be0 SHA256 1eb87038d9d9494963a7562ab76d298504402b98ab9617d4831d5b25c9b2e51f
-MISC ChangeLog 672 RMD160 ff6160f9bb9c0cef6212e1035b79da33f576e5cc SHA1 c20bfde428cdabf563d3d0f6016b53ee7e1f8ad6 SHA256 f63cfe393f83310417f4bb18e48ce0bdd78519f29d4d0cc03c5f6c620edc9071
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX mswatch-1.2.0-gcc47.patch 565 SHA256 5fa3edf35bcf8f887b0a59138aca77bf64fbe52c90229ca1d178399cbf920181 SHA512 ad46ba2610303b55a1c30060af407a127847a175e86fb5c9a292fe18874ae0a2b042982890bc013385b5bba82e723a6df64c65e53a8bad39e51c35777d370d1b WHIRLPOOL 4e21a1cd0e79c046bb48668758a6c4c313bc755955778e0a5fe33511686444f69503a73f72414b11db0a2139b066888319cac5d76247a9cc691cec4738d48b04
+DIST mswatch-1.2.0.tar.gz 434986 SHA256 2623514442237e11c91a06ab406d9594669ddb70fd1d55b84371ea613e8ac1a7 SHA512 c6774993909cb066514cb0ceb163bfd5e023d357435c6779d2d049cc9d56a278d5502193af1f4f5d6af264ff041b43b6c0fe2c400f775e8c22ed395a183c75f9 WHIRLPOOL c5ce2269cbc73fb4e057261751ba43077c4cf4204033ce21bbfb80ede981476c5385080d4d07505c1d8a12812c758e0a573d477f3c5c6451126996bc5b758e35
+EBUILD mswatch-1.2.0.ebuild 861 SHA256 884eee56a4eac199975c02bc33ff544ef805a9222311b7c4d411de862dc6a883 SHA512 43a15432a7bba6482fb6d31007ff432b74e1761925016e971d039f9fa94737af4339580f9d3e8823e8608ca38649c5782f172df28c070c714f3275d6349e5089 WHIRLPOOL 3928cb2ab6d76708c4c4642e6ec65f60fdaeb5ea2a36422cc36973d67087e70a544ad5283b5a87621c0a2912e5577bf1e802d218a8f9a43162206e1b2bdeafea
+MISC ChangeLog 822 SHA256 f2a774b40d2ce01a807615b3ba017de3300dad02553df866b0980cf8d62d3a9d SHA512 82bbbe25b59afb5a49d71359fa00a8a74c06f2c5d04a1bae5b8392429deddd5ce9da35956b7c7b5a98815e6be249e24925b04978c198059af2079d2ce9d7e962 WHIRLPOOL a73d6d6103fd7ac2b590cf4e53e101290af00acd6a8ee28888a535bcad324c8ac89e5b5c375ae8cb0b4ca7584dd4de9818fc7c6edafc636106c4fdba8eee78c0
+MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRMuYyAAoJEO04vUmVeoRjCyEIAMPJVahtFXtDsQuE4OsPSK0P
++7SO5aPbGMm77rjkUq0cEA5pITc86CsIicNlfY2i/I12QNez9XEqJ0gIY2WI4QbE
+2JwPf6kM1OMq4MLnoQTmJh9u/OW72twTyDpYa8jJBfBVsVpyIXMbn8r3/5AsqF58
+ii/sDJuiOXuO8Wxr+NERDxs2MVBZqgVw0ZPPGROHuzJTdiHo6VI5ZUs/aJmMXlOL
+qxmNsoYWWovNCog6EPxrOXHjap6WyP3gzJF1A/EDaMf3oJrsqp5gW2F7ODQVO8YD
+4qFgCR3zqjrjTspGbL3Z0y3jPKsznaYIiNMKRrK9et86u2iTWaEM6sobUsQVWjo=
+=/uaD
+-----END PGP SIGNATURE-----
diff --git a/net-mail/mswatch/files/mswatch-1.2.0-gcc47.patch b/net-mail/mswatch/files/mswatch-1.2.0-gcc47.patch
new file mode 100644
index 000000000000..c11052164c66
--- /dev/null
+++ b/net-mail/mswatch/files/mswatch-1.2.0-gcc47.patch
@@ -0,0 +1,26 @@
+ https://bugs.gentoo.org/424673
+
+ src/lib/util.cc                     | 1 +
+ src/watch_maildirs/inotify/state.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/src/lib/util.cc
++++ b/src/lib/util.cc
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ #include <sstream>
+ #include <string>
+--- a/src/watch_maildirs/inotify/state.cc
++++ b/src/watch_maildirs/inotify/state.cc
+@@ -1,6 +1,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include "lib/util.h"
+ #include "state.h"
diff --git a/net-mail/mswatch/mswatch-1.2.0.ebuild b/net-mail/mswatch/mswatch-1.2.0.ebuild
index 26aac1a974ae..3597856a87c3 100644
--- a/net-mail/mswatch/mswatch-1.2.0.ebuild
+++ b/net-mail/mswatch/mswatch-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mswatch/mswatch-1.2.0.ebuild,v 1.4 2012/05/03 04:18:37 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mswatch/mswatch-1.2.0.ebuild,v 1.5 2013/03/03 05:46:18 dirtyepic Exp $
 
 EAPI="4"
 
@@ -23,6 +23,7 @@ CONFIG_CHECK="~INOTIFY_USER"
 ERROR_INOTIFY_USER="${P} requires in-kernel inotify support."
 
 DOCS=( AUTHORS NEWS README THANKS TODO )
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
 
 src_configure() {
 	local myeconfargs=(