From ec4f5d4a509c994bda1307dd94899837396637cf Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Thu, 12 Jun 2008 08:23:34 +0000
Subject: [PATCH] dev-db/libflaim: add gcc 4.3 patch

---
 .../experimental/dev-db/libflaim/ChangeLog    |  4 ++++
 .../experimental/dev-db/libflaim/Manifest     | 17 +++----------
 .../libflaim/files/libflaim-gcc43.patch       | 24 +++++++++++++++++++
 .../dev-db/libflaim/libflaim-4.9.845.ebuild   |  8 ++++++-
 4 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 branches/experimental/dev-db/libflaim/files/libflaim-gcc43.patch

diff --git a/branches/experimental/dev-db/libflaim/ChangeLog b/branches/experimental/dev-db/libflaim/ChangeLog
index ddc5e90..0119c79 100644
--- a/branches/experimental/dev-db/libflaim/ChangeLog
+++ b/branches/experimental/dev-db/libflaim/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2008; Mario Fetka <mario-fetka@gmx.at> +files/libflaim-gcc43.patch,
+  libflaim-4.9.845.ebuild:
+  add gcc 4.3 patch
+
   26 Jan 2008; Mario Fetka <mario-fetka@gmx.at> +metadata.xml:
   initial ifolder import from http://trac.one-gear.com/chaos/wiki
 
diff --git a/branches/experimental/dev-db/libflaim/Manifest b/branches/experimental/dev-db/libflaim/Manifest
index fad9a8d..ee7a971 100644
--- a/branches/experimental/dev-db/libflaim/Manifest
+++ b/branches/experimental/dev-db/libflaim/Manifest
@@ -1,16 +1,5 @@
+AUX libflaim-gcc43.patch 875 RMD160 2a4069df35a306f34591ce075e60cef2a065d1b0 SHA1 54ac2c3d916e8ddcc7c24a9ffa89416f94bee859 SHA256 23849422c961cf8c2dd92ee9e70f3f03234fde711fb9a910dd49ce79dfe7ad7b
 DIST libflaim-4.9.845.tar.gz 2852582 RMD160 28210d8f1f48813f07b85090d7b8028d2f37a1df SHA1 c3b4ae0dc68ae9d26cc3d28f286cd0bc509f4212 SHA256 32992394f70be202eb85a17082b2a30a2bc5d1cecdcc031e272176eac6d1807c
-EBUILD libflaim-4.9.845.ebuild 744 RMD160 a495a75dbbbdb055a95da080dad2f5c823eb24cb SHA1 621a6eb3de7014cea097da939f27320162e7ccd6 SHA256 697e2d4753f2b0642cea6d65b5cfd7365d5395677702d852236e901eaaf9dbed
-MD5 e027d6fa91209541aacc880dfe80ff75 libflaim-4.9.845.ebuild 744
-RMD160 a495a75dbbbdb055a95da080dad2f5c823eb24cb libflaim-4.9.845.ebuild 744
-SHA256 697e2d4753f2b0642cea6d65b5cfd7365d5395677702d852236e901eaaf9dbed libflaim-4.9.845.ebuild 744
-MISC ChangeLog 246 RMD160 29ebd9e17aecfdb2f55dac7595e70ee3f35784b9 SHA1 97f85b5a77a11c495488cc9e2853b01c2b287ff8 SHA256 d5cc27c35b5d756536f9ef547e1a49d52d0217c836175ec5162b1aab81fffee7
-MD5 cad013f6642dd98ff0ca2326794acaa6 ChangeLog 246
-RMD160 29ebd9e17aecfdb2f55dac7595e70ee3f35784b9 ChangeLog 246
-SHA256 d5cc27c35b5d756536f9ef547e1a49d52d0217c836175ec5162b1aab81fffee7 ChangeLog 246
+EBUILD libflaim-4.9.845.ebuild 825 RMD160 4fa85ae820dac8a355ccac402d0a717a9ad2f064 SHA1 74ec11ff4b46336a50e530de3e351427591d8dad SHA256 ca1dadb9c7361b2af4936536d197e18ba790abfab36aa0ca699b452f63634272
+MISC ChangeLog 371 RMD160 8a9656c175b5b2ad21a14f0809c42597f254a9cf SHA1 73b3ae6c69bb818697bbbe54ce12da19770b58d5 SHA256 589a2dbc00332adc5ff6dfe6eda0b2bf1fef36eecdecd85a200087a820effb9b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
-MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
-RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
-SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 1223bc602f288e5f42db429fb2023bc2 files/digest-libflaim-4.9.845 253
-RMD160 86a1626f4e1cca9dca7247bc828bbc1ee1736015 files/digest-libflaim-4.9.845 253
-SHA256 a525146bd507196ee1e1ff1b431b95eadc8f43b99c3b68aa9e1928abc70a050d files/digest-libflaim-4.9.845 253
diff --git a/branches/experimental/dev-db/libflaim/files/libflaim-gcc43.patch b/branches/experimental/dev-db/libflaim/files/libflaim-gcc43.patch
new file mode 100644
index 0000000..b714a3c
--- /dev/null
+++ b/branches/experimental/dev-db/libflaim/files/libflaim-gcc43.patch
@@ -0,0 +1,24 @@
+--- flaim/src/kybuild.cpp	2008-02-15 20:02:22.000000000 +0000
++++ flaim/src/kybuild.cpp	2008-02-15 20:02:50.000000000 +0000
+@@ -533,8 +533,8 @@
+ 				if (pIxd->uiFlags & IXD_OFFLINE)
+ 				{
+ 					if (uiContainerNum > pIxd->uiLastContainerIndexed ||
+-						 uiContainerNum == pIxd->uiLastContainerIndexed &&
+-						 uiDrn > pIxd->uiLastDrnIndexed)
++					    (uiContainerNum == pIxd->uiLastContainerIndexed &&
++					    uiDrn > pIxd->uiLastDrnIndexed))
+ 					{
+ 						continue;
+ 					}
+--- ftk/src/ftk.h	2006-10-12 23:56:32.000000000 +0100
++++ ftk/src/ftk.h	2008-02-15 21:00:17.000000000 +0000
+@@ -3687,7 +3687,7 @@
+ 	} F_TMSTAMP;
+ 
+ 	#define f_timeIsLeapYear(year) \
+-		((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0))
++(((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0))
+ 
+ 	void f_timeGetSeconds(
+ 		FLMUINT	*		puiSeconds);
diff --git a/branches/experimental/dev-db/libflaim/libflaim-4.9.845.ebuild b/branches/experimental/dev-db/libflaim/libflaim-4.9.845.ebuild
index 32e51e0..50f9ce6 100644
--- a/branches/experimental/dev-db/libflaim/libflaim-4.9.845.ebuild
+++ b/branches/experimental/dev-db/libflaim/libflaim-4.9.845.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 inherit eutils
@@ -17,6 +17,12 @@ RDEPEND=""
 
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libflaim-gcc43.patch
+}
+
 src_compile() {
 	make DESTDIR=${D} OSTYPE=`uname -s` HOSTTYPE=`uname -m`  || \
 	die "Error compiling ${PN}"