Fixing gcc 4.4.0 and icu 4.2 build error, bug #270154 , patch thanks to Steffen 'j0inty' Stollfuß

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 41 insertions, 15 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 20402a01d185..c9c3df228b7d 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/firebird
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.97 2009/01/18 22:03:05 jsbronder Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.98 2009/08/13 17:38:10 vostorga Exp $
+
+  13 Aug 2009; Víctor Ostorga <vostorga@gentoo.org>
+  firebird-2.1.1.17910.0.ebuild,
+  +files/firebird-2.1.1.17910.0-gcc-icu-declare.patch:
+  Fixing gcc 4.4.0 and icu 4.2 build error, bug #270154
+  patch thanks to Steffen 'j0inty' Stollfuß <steffen@stollfuss.net>
 
   18 Jan 2009; Justin Bronder <jsbronder@gentoo.org>
   firebird-2.0.3.12981.0-r6.ebuild, firebird-2.0.3.12981.0-r7.ebuild,
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index b94302d6997f..0936d532295e 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
 AUX firebird-2.0.3.12981.0-CVE-2008-0387.patch 3279 RMD160 462a32e8bc64c2ede4852901a9ff7036a7c3b52a SHA1 7c87e7f41e8c408b190d84e80f7c6aa1a5c0753c SHA256 62dd30ec1a785578a4686ba37e82fedbc0b00d0e95735b4aab9b056b5b82ad4b
 AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 RMD160 2bfd332b7d551402a1c9bed8b4706fc57cc80ec0 SHA1 38bc58cec68a4b9b12315846c3eb5f8c967e83e3 SHA256 f4de4b4b988669378b09fcbba59dac96b22a3b4cfeb6bdf7db45c4a16f81fd05
@@ -9,6 +6,7 @@ AUX firebird-2.0.3.12981.0-flags.patch 960 RMD160 9c75259b1fcd281a7c1e272bd20992
 AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b SHA1 05d6e9c3b3dd0ac8f0093307cc5e3a1313f4dcb8 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb
 AUX firebird-2.0.4.13130.1-deps-flags-libs.patch 4203 RMD160 161ab78880b17e2275c2efa76c656522eec8ae48 SHA1 8958d7ca6f394e18eef284e7676de3e6e977ad4d SHA256 3bb39901e22dff3350451c2e7953c71c988c7ec6be1e12386c410ca66644a499
 AUX firebird-2.1.1.17910.0-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a
+AUX firebird-2.1.1.17910.0-gcc-icu-declare.patch 537 RMD160 2464b9328098ec7db82a4a84aa31cf0fe1e6e521 SHA1 604dc760fcd056c8376548233d1043f8229b11bb SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339
 AUX firebird.conf.d 73 RMD160 3ed3f866ee37d8e99b5dd32132ae78889ddeef66 SHA1 a5f9ef1b7c1186feecdf7574cacca6b589c8029f SHA256 7c430ddf7aa8fdf6b68ef88e44ad0d7d546469f6fdc156bdc340fffefa85408c
 AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d10907676a706bdecae27321861ccd0e89bc7993 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
@@ -20,13 +18,6 @@ DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 10003 RMD160 4858fcdca62966f8296c45710b2b70f3bf339428 SHA1 4fbcddb11d63ff3cf2779faf735530a216ed9159 SHA256 ca4c33a6577fa781b3f7c6ac6fb66874436d7ea85670f7d5fb8d9acaf932c8fd
 EBUILD firebird-2.0.3.12981.0-r7.ebuild 9973 RMD160 1fa0f590c57bdf79ae27c02203f10642b33cfae9 SHA1 b23a6f29d7df3a4299cf9dfe14cbaa4d4ca57212 SHA256 9b8a27a5590a141a1add117db155082cd4acad51b98600447850a92ab7e2c621
 EBUILD firebird-2.0.4.13130.1.ebuild 9796 RMD160 c326d22650d17fe8eb7415993dd591b2bfec8471 SHA1 887bcfdd22ac4ba7c21472a96b825df83c472173 SHA256 65f1c3398ee83f6bb134c9cad68a2f430bf0567360535835090ca0b41554ed17
-EBUILD firebird-2.1.1.17910.0.ebuild 10072 RMD160 d8cd90fa5b9fb6673a98f52fe9afe1b3935f3b5a SHA1 96adadc423b3daa24f2b949fedbc0782184032d3 SHA256 534dc9ff3f0f953a5e4e2b78b630dd00db7fcc445f94fe236ae34cd7fa889de1
-MISC ChangeLog 21209 RMD160 28067f324fd62a0522d23d3580568c21e609f962 SHA1 fddd3df44f7dd98981a5fc4f98da277140320ba9 SHA256 5630bb0c13e54a43d910596cb61e6077a9b3b302f6c1401d0ae150e524615ac9
+EBUILD firebird-2.1.1.17910.0.ebuild 10121 RMD160 56152a9d2b5160858ddf9d63fff172a30461eda5 SHA1 900683375ab92f08e4d9acc648732a52a1b86c39 SHA256 c5d463df2873b128997b938de31815c52bf519dc596c1b5a0d9d72817f782b61
+MISC ChangeLog 21475 RMD160 45b1ec1210137e5d8f22274505e7f000cc750843 SHA1 bf950c65bc1607bbd2f4e839994490aef58eb557 SHA256 7163f9f95e7a3557c900f0d5cc4f9de62fe02178b6e5ac1f68687d64cc73b5f2
 MISC metadata.xml 619 RMD160 098761b0ad299b3c7bf0d3b59b9ebe2cf01cc145 SHA1 ef2a0fbd0a8b21692ae1a2a12e8b0ce7222fff9f SHA256 6b01dc565960c0345d81dafc9775196f4bc719eb925ea94c6b0a0c20e195e9e8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklzpx8ACgkQ4MrvBE1wQ8m3ewCeJSmxec1HW+yOTEZW1VCNXzTr
-h2IAoJwpb3JlCukGH9Hkjz//wyIo8UgE
-=NBAf
------END PGP SIGNATURE-----
diff --git a/dev-db/firebird/files/firebird-2.1.1.17910.0-gcc-icu-declare.patch b/dev-db/firebird/files/firebird-2.1.1.17910.0-gcc-icu-declare.patch
new file mode 100644
index 000000000000..1e0fc093668e
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.1.1.17910.0-gcc-icu-declare.patch
@@ -0,0 +1,27 @@
+--- src/common/classes/alloc.h.old	2009-07-09 13:04:14.000000000 +0200
++++ src/common/classes/alloc.h	2009-07-09 13:05:37.000000000 +0200
+@@ -48,6 +48,8 @@
+ 					   stdlib.h (EKU) */
+ #endif
+ 
++#include <new>
++
+ #ifdef _MSC_VER
+ #define THROW_BAD_ALLOC
+ #else
+@@ -448,15 +450,6 @@
+ 	);
+ }
+ 
+-inline void* operator new(size_t, void* ptr) throw() 
+-{
+-	return ptr;
+-}
+-inline void* operator new[](size_t, void* ptr) throw() 
+-{
+-	return ptr;
+-}
+-
+ inline void operator delete(void* mem) throw()
+ {
+ 	Firebird::MemoryPool::globalFree(mem);
diff --git a/dev-db/firebird/firebird-2.1.1.17910.0.ebuild b/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
index b04a40723384..1a4f0677a3c4 100644
--- a/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
+++ b/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.1.17910.0.ebuild,v 1.2 2009/01/18 22:03:05 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.1.17910.0.ebuild,v 1.3 2009/08/13 17:38:10 vostorga Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -120,6 +120,8 @@ src_unpack() {
 	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
 	rm -rf "${S}"/extern/{editline,icu}
 
+	epatch "${FILESDIR}/${P}-gcc-icu-declare.patch"
+
 	eautoreconf
 }