Patch by Maciej Piechotka allows building on GCC 4.6; closes bug #362991.

Package-Manager: portage-2.1.10.18/cvs/Linux x86_64

4 files changed, 20 insertions, 24 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index 28868fdcfe9a..2567c50878d4 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.7 2011/08/10 21:09:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.8 2011/09/24 13:05:32 chainsaw Exp $
+
+  24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> Ice-3.4.2.ebuild,
+  +files/Ice-3.4.2-gcc46.patch:
+  Patch by Maciej Piechotka allows building on GCC 4.6; closes bug #362991.
 
 *Ice-3.4.2 (10 Aug 2011)
 
diff --git a/dev-libs/Ice/Ice-3.4.2.ebuild b/dev-libs/Ice/Ice-3.4.2.ebuild
index 2e3910d4ecf2..edf1b4c85981 100644
--- a/dev-libs/Ice/Ice-3.4.2.ebuild
+++ b/dev-libs/Ice/Ice-3.4.2.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/dev-libs/Ice/Ice-3.4.2.ebuild,v 1.1 2011/08/10 21:09:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2.ebuild,v 1.2 2011/09/24 13:05:32 chainsaw Exp $
 
 EAPI="2"
 
@@ -56,6 +56,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.4.1-db5.patch
+	epatch "${FILESDIR}"/${PN}-3.4.2-gcc46.patch
 
 	sed -i \
 		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 7e6b47af9f6c..78cea85ca537 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX Ice-3.2.0-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed SHA1 2e63175980d2b1ee420a37a36e9b8c570285967b SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1
 AUX Ice-3.2.1-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed SHA1 2e63175980d2b1ee420a37a36e9b8c570285967b SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1
 AUX Ice-3.2.1-gcc43.patch 10027 RMD160 0f0e44eae6eee673628094c7f924e2128f38814c SHA1 31a60a37e50f4d440589e6278f7f29839df5ecf7 SHA256 b86df9b5fa6bc2c15b1479cbec33040fee67551fbf1086e0e697820d18f9b60c
@@ -11,6 +8,7 @@ AUX Ice-3.4.0-openssl.patch 486 RMD160 2011b7520dc29da8660afff46f3a10a845c574d9
 AUX Ice-3.4.0-stream1.patch 1300 RMD160 2cc981de643a92e618f1619ba9eee79bcf72c7f5 SHA1 1e856b5ff62185693e7cb123e304a7fa0879edb9 SHA256 b7fd0231b1dce875c007ae5c86cbdf822f83f8b554f011d87a1ac8479bf775f8
 AUX Ice-3.4.0-stream2.patch 305 RMD160 13da0516405da5560383cba5d10f2fcd5341bc8e SHA1 31a5c4298d9ee503072e9ed9ad2ff3aa75e72d8d SHA256 091d93c5ea5e4e35ecae95175a0c1158fb33988fe2a34c3da790b2b7f401b53a
 AUX Ice-3.4.1-db5.patch 468 RMD160 b1b7e93c30233b8b2356ad70d3d0fdf45445fbef SHA1 141478dd9dd73bc40dc23e1c1521859d177c1e97 SHA256 53d5c688e6ec716c33f427b0efdca0a9da4c5d5e5b2f260e72127a0543875a87
+AUX Ice-3.4.2-gcc46.patch 275 RMD160 5d753d052298e821dd799d2ad9ab9ce78f1d9a21 SHA1 ecc4347aaeb6c4f0b12ef3bf5cfa8d94e2045986 SHA256 eb1d14656f19ee919441586682308210ec9877fc814a642a84ab56a818b5c737
 DIST Ice-3.2.0.tar.gz 2060037 RMD160 b11fc5718f4c86b349bf0ddc15d7cf402720a013 SHA1 e3b91f14f280a2df78ec5bfed2d9c7e97890ea51 SHA256 4698326e39342d2526c8780db996e47d35a09cdc6080be4329980ec5766ce81d
 DIST Ice-3.2.1.tar.gz 2090576 RMD160 c3394486ba13e94c2491b0dc48dc19c3e7565ecd SHA1 69fc7dbdff81d7d9300b57f6e495914f3c9e5c19 SHA256 bd24cfe0296d81e2b04ea8d97b32a4f13fdd949d0f038f4c7e0922b395075149
 DIST Ice-3.3.1.pdf.gz 5798120 RMD160 1b162529bc35a716c3713242fad2ccc6b3d639f1 SHA1 1136ec0d1634c34aa7a7c0afba6f871c5b9e5ccb SHA256 816b1cb1fcb675abe33ada3dd2a0bb174a8cc6130f9f5c03b5c623c4956efc5b
@@ -28,23 +26,6 @@ EBUILD Ice-3.3.1-r2.ebuild 5981 RMD160 e68a18ca6b807d33a85c1fa7f8df42d094a18337
 EBUILD Ice-3.3.1.ebuild 1562 RMD160 9385ec0615907af14caf37a9a69b78d3e172b8cd SHA1 4a874c1779529adccfa1960c660b586970366bf9 SHA256 091ff845f78d8795e4d0b3980df51efac6c4c8fca94404debbcdfe1a6938c086
 EBUILD Ice-3.4.0.ebuild 6136 RMD160 4a652a1b76466d45302906c20538f92b0a0a19c9 SHA1 8e1836b3b568af2b723314d58e53bfeccf9bcf7e SHA256 f00185d6b18e9ece2f1c54a1021a671457b46335742596724b54e9a9ed105d74
 EBUILD Ice-3.4.1.ebuild 6843 RMD160 d5b70009202c664fef24604b4bebec6ef45da9ed SHA1 aec49a84cc37680b4f947c150ac5bdaf9a78021a SHA256 ce9eb8ba8393d672430b89506a9693dc0276eaa43fb160fee839616808e6569a
-EBUILD Ice-3.4.2.ebuild 6801 RMD160 f47421d5de3cc61942608be85235ae7d050689dc SHA1 c1a4a357018945522012efc12059db5593e684eb SHA256 3ace92f19fcc42a474be7d4f63bd088210556350b5ba1929e236b5557b1c39c9
-MISC ChangeLog 8129 RMD160 e73b6d60b776d0e99c4f11cc9e0f0f12eaf34f46 SHA1 29bd47aee57c18d28c8aab01ba9d0a87e27c5770 SHA256 94f20330abfda6e4943b14c66288e6e7ce28421a9c2f22fc4b542e525bfa80d4
+EBUILD Ice-3.4.2.ebuild 6843 RMD160 82bc7cf9b449a636e9f176611069f0e153aa7366 SHA1 d59d234c9e7b2b59981f2c07631c9c2e008ab9f4 SHA256 649e843c6c613c97e7f3f3765064501a5066f8ccfe291927cbcca433c4611335
+MISC ChangeLog 8300 RMD160 232986232ac20b877d4cbb4ff245061a1bd7d869 SHA1 e874ee04db59af8636bdd019d40ff2428292eaf6 SHA256 0ed8eeda4c31ad8f70027a5cc8fa58a2fc700dfc0201ca7780423f7321d53026
 MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOQvOBAAoJEPiazRVxLXTF8KgQAIh8KVHaUlU/s1eNi+sdiqlE
-7JYGR5loxZXJmvBlD5fpbXv29L2R/8lXZl5U1qKBoI3xIOUVHGdgAGByQ3lOFf11
-f/KZ0nMz9OtKnOvn49iLJCY3NN3oX16mRPhN9BDr9I2HMyWsCIreXfAk1YgEru5p
-r7cQT8oSHl97MABXnZRE+A0vYuTTlBlGLdxtYV3wXnVcIh5JsimHUDFRXE8PXSZA
-wOZy3PMSTSlaXbr7JyC3WM6IOofpCN4NKKOYIrLO7/fAE8go1LbfxGMlsYvNYAzJ
-eVsN6BwZelR2B/uwa82FYGLlVhDGy8Gqhabl0HEua8zRLwcXdiBZgIwzSHfvbESh
-WqBkdK8hokX/cAafqPg9se8losj5WwAcUL1T+UpmnKM1PNQyzjuRXuwIUUcrEjA6
-gUIb8aeUHauHYEBKKTOM/C7x4z+mstajgQw6ur9tsVRdsXUeL8URo1e9bEV/5tNd
-Z2VOGV+gfkiTstRfvt8ZSW41eK2hoKVd0nbEsMDY5iqlTwzhZXKiM0ISorL9pEmw
-DHP5bupwahlJ1KJT8TjvdeGFwn5FpqGdfIc82GsU6fbmbvlSsf/fz19eqgLgm6ZC
-jzVXsswe55frehuQLcXhvlu0p91EA6QXE/SFuSh3dQ5IG8BuuOw/szasq6Wh1FdZ
-zkIjhNA7uzCUuTmGOFVB
-=b66g
------END PGP SIGNATURE-----
diff --git a/dev-libs/Ice/files/Ice-3.4.2-gcc46.patch b/dev-libs/Ice/files/Ice-3.4.2-gcc46.patch
new file mode 100644
index 000000000000..a047c6e8541c
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.4.2-gcc46.patch
@@ -0,0 +1,10 @@
+--- Ice-3.4.1.old/cpp/include/Ice/Buffer.h	2010-06-03 17:48:33.000000000 +0100
++++ Ice-3.4.1.old/cpp/include/Ice/Buffer.h	2011-07-20 13:20:04.000000000 +0100
+@@ -11,6 +11,7 @@ 
+ #define ICEE_BUFFER_H
+ 
+ #include <Ice/Config.h>
++#include <cstddef>
+ 
+ namespace IceInternal
+ {