Add gcc-4.6 support. Per bug #362863.

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

4 files changed, 23 insertions, 7 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 1be0d1ffc07f..35e35fba7f0c 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.29 2011/04/05 18:50:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.30 2011/05/03 07:41:02 scarabeus Exp $
+
+  03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.7.1-gcc4.6.patch, vigra-1.7.1.ebuild:
+  Add gcc-4.6 support. Per bug #362863.
 
   05 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/1.7.1-png-1.5.patch, vigra-1.7.1.ebuild:
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 133fccb9ea62..65a7b854e0f3 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX 1.7.1-automagicness.patch 1608 RMD160 caa7ccad70104818b326b40c02e3f35797de4b10 SHA1 fbb5b7843c17a8a5f55db13d458eef444cc5adbe SHA256 8d6d73ff40155cd34eff25ff8f32c8bd25f32d63264548b3262fb8b788526957
+AUX 1.7.1-gcc4.6.patch 276 RMD160 f828fbc62d4dcd2125ea7850c51ee5503c2025f0 SHA1 9608a6a313dc2fa1a26adb6d0439d422307890c5 SHA256 d495cd36fc37de7997e2791dfd5259195f1bda424a9195064b70f9920b77a6c7
 AUX 1.7.1-hdf5.patch 1290 RMD160 c9dd4347ce5f289fe0389a0ab1b8f55f102b3d87 SHA1 16d7596331f0a3836e286265377a3907f7cdd9b8 SHA256 ec366d57999b7353fd57c9095c4bf88323639195ba5edd6c67a0ebb7b42a50f0
 AUX 1.7.1-png-1.5.patch 1259 RMD160 782a8a41a8a6bc5433c98ef39a190bfe1eb7d57a SHA1 15370e3151eb84281b35d2bac97054662dc2bab9 SHA256 28e1fa88143bdda03dadde5dfa43e1c86e38e338907e12d0e7cb23d5c6b85c68
 AUX vigra-1.6.0-gcc44.patch 635 RMD160 2d787b30517e501f9eb97f9c83e5b8697f6598c2 SHA1 21600a4fae903e3b34e1c869f01b4de1c1c2bdd3 SHA256 800afef55c0e390f831207c98f047bccd80c3538ad998ff0dc8bc9269e98a277
@@ -10,13 +11,13 @@ DIST vigra-1.7.1-src.tar.gz 28481160 RMD160 67a27b11f3d844b01fd8f2b0d2fe761099f8
 DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 SHA1 9714a0c4efb77726a1140329e98e5db057f9a69f SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 EBUILD vigra-1.6.0-r1.ebuild 1868 RMD160 08c8f8cf69882a08bf592338e21fd9d217f8ec1f SHA1 ee0998c032b980d83ba22c87d4529baf038f8528 SHA256 ca2a73b0793148da0324090b88c116b3a0980aa86638ade881f4d8dfa700303c
 EBUILD vigra-1.6.0.ebuild 1789 RMD160 69179708fa9529d8f407c287387074ba1919114e SHA1 9cc802878bdfdf969565d4206d8608445163f554 SHA256 3b65150bb7c379a9c2c84e7c8801a70f612dbb5e3d01e86a95874badc958a5aa
-EBUILD vigra-1.7.1.ebuild 1910 RMD160 24037807fecba93079732848eb84c0ad6f92f39c SHA1 66342b90bacd186b559522de797af04267f6377a SHA256 84e49b616f2fe7b25d761402186ddfc08e910da4c820d1f3bd441d74bfea08ab
-MISC ChangeLog 4040 RMD160 8c493c0e5a9ade362f5f1a6a02ddf2b907161356 SHA1 73767db2c74fb0bdc0a62af3fdbb60c7484a52de SHA256 2c0835bcb9fe75d02ac50960fa7374339166b541dc4579f859b86fee89fe7331
+EBUILD vigra-1.7.1.ebuild 1944 RMD160 311232d634a4ca294f5b7708975b6f1f0d267e3c SHA1 80594094e1c96d48f8e6c42ac269e5d166979539 SHA256 23e50dbbd5098d84af4f7e749569620d6c763455853950541818a7853f47b078
+MISC ChangeLog 4185 RMD160 6914083cab39e1e3b325d7e461a2b77804031fd2 SHA1 9f4e279c41dac75427bf3fd05d47993acab37df6 SHA256 c3beb3dbf67faa5a2b1fd97ef7a4c95e4b428f882f7556cfbec3e39c55931808
 MISC metadata.xml 187 RMD160 9c8b8edd91cb93979173540d1df3d264539f1f94 SHA1 c1f16177a9daf628b0fe0dcc6f8e694111d2a578 SHA256 6f9a63412850ecb6e6c0d6989f6ebe6dffe84bbb1bf3038cf8a0491b7c819161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2bYwoACgkQHB6c3gNBRYdJcACeLl7+M+Vy1W23qOyJWGOSFxQB
-FmcAn3CsVg6E5ZtIAMqKj96taqQnLCxT
-=DqcV
+iEYEARECAAYFAk2/sZIACgkQHB6c3gNBRYdOSACgscTCGxqJCs3lsu9TRPzWahJ6
+4sYAoIBFb5mz7one9E3cwS5AoEuZItlJ
+=ESit
 -----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/files/1.7.1-gcc4.6.patch b/media-libs/vigra/files/1.7.1-gcc4.6.patch
new file mode 100644
index 000000000000..9ff02ffbf8cb
--- /dev/null
+++ b/media-libs/vigra/files/1.7.1-gcc4.6.patch
@@ -0,0 +1,10 @@
+--- a/include/vigra/sifImport.hxx	2011-04-10 09:36:12.735845000 -0500
++++ b/include/vigra/sifImport.hxx	2011-04-10 09:36:41.805845002 -0500
+@@ -58,6 +58,7 @@
+ #include <cstring>
+ #include <vector> 
+ #include "vigra/multi_array.hxx"
++#include <cstddef>
+ 
+ namespace vigra {
+  
diff --git a/media-libs/vigra/vigra-1.7.1.ebuild b/media-libs/vigra/vigra-1.7.1.ebuild
index 5fade157d8c1..bc2683e231b2 100644
--- a/media-libs/vigra/vigra-1.7.1.ebuild
+++ b/media-libs/vigra/vigra-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.3 2011/04/05 18:50:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.4 2011/05/03 07:41:02 scarabeus Exp $
 
 EAPI=4
 
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}/1.7.1-png-1.5.patch"
 	"${FILESDIR}/1.7.1-automagicness.patch"
 	"${FILESDIR}/1.7.1-hdf5.patch"
+	"${FILESDIR}/1.7.1-gcc4.6.patch"
 )
 
 # Tests fail because they have hardcoded dependencies on those