GCC 4 patch, thanks to Dave Baker.

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 66 insertions, 11 deletions

diff --git a/media-libs/libofa/ChangeLog b/media-libs/libofa/ChangeLog
index 8b2fd2e524b5..d2083767a3a5 100644
--- a/media-libs/libofa/ChangeLog
+++ b/media-libs/libofa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libofa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.2 2006/08/27 14:39:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.3 2006/08/30 18:57:50 carlo Exp $
+
+  30 Aug 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/libofa-0.9.3-gcc-4.patch, libofa-0.9.3.ebuild:
+  GCC 4 patch, thanks to Dave Baker.
 
   27 Aug 2006; Carsten Lohrke <carlo@gentoo.org> libofa-0.9.3.ebuild:
   Fix whitespace.
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index 1a00cc98bb8a..cb8e5e8a1efe 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -1,12 +1,16 @@
+AUX libofa-0.9.3-gcc-4.patch 819 RMD160 438764c9c9ab5a1a9ede64c505c140cc53aabf9b SHA1 cb19377d0634c03d2a49cfc61915cec918c341f7 SHA256 29955fe97cdb3cc2eb72b7b05f1ae38cc5c98b1740a0db96d61f51a13d380cd8
+MD5 a6f78b90bd0f4354d022a71c3e58ef6c files/libofa-0.9.3-gcc-4.patch 819
+RMD160 438764c9c9ab5a1a9ede64c505c140cc53aabf9b files/libofa-0.9.3-gcc-4.patch 819
+SHA256 29955fe97cdb3cc2eb72b7b05f1ae38cc5c98b1740a0db96d61f51a13d380cd8 files/libofa-0.9.3-gcc-4.patch 819
 DIST libofa-0.9.3.tar.gz 384043 RMD160 77f393570bb5356026c4b9c7195236bd96cb9143 SHA1 3dec8e1dcea937f74b4165e9ffd4d4f355e4594a SHA256 0216466153e92058c5202dea03390ddc7601d916b983f71ce4f4d034405590a0
-EBUILD libofa-0.9.3.ebuild 868 RMD160 5f652150097c7d7938bb1997826baf9370a91a8c SHA1 745249e2e02a06c87ac494e4da3c2435dfc8443d SHA256 6e05f1f76f226a7c994c3c35b013d4114450c71bd8d6bfd5420c270e701d1b3a
-MD5 5c8ab8b271ff2f6295a10feb059b2c16 libofa-0.9.3.ebuild 868
-RMD160 5f652150097c7d7938bb1997826baf9370a91a8c libofa-0.9.3.ebuild 868
-SHA256 6e05f1f76f226a7c994c3c35b013d4114450c71bd8d6bfd5420c270e701d1b3a libofa-0.9.3.ebuild 868
-MISC ChangeLog 476 RMD160 c982c569a87d0855b0e56128b229cb6bca76a6da SHA1 91639ad5f92c18d8702ff530f210cd40a03fa0a9 SHA256 53a545ec2c9e073b87b4ce439fa9b6d2e136445bbce2e3b2c3bf6dd59df43be7
-MD5 8bdd73ba421fb0e14e390b158339574d ChangeLog 476
-RMD160 c982c569a87d0855b0e56128b229cb6bca76a6da ChangeLog 476
-SHA256 53a545ec2c9e073b87b4ce439fa9b6d2e136445bbce2e3b2c3bf6dd59df43be7 ChangeLog 476
+EBUILD libofa-0.9.3.ebuild 970 RMD160 a403db8cdd1c07cf6390fd0c5cc9c4d45ae7e919 SHA1 1115ba30e3e9964a0005ca5b5ea52db0cf11cd95 SHA256 d86dae2cbfbd963053589815c354bb9556c98b0876b376a86597db11dfbd4172
+MD5 7106d29c5992a285ec6f2afcb59d0174 libofa-0.9.3.ebuild 970
+RMD160 a403db8cdd1c07cf6390fd0c5cc9c4d45ae7e919 libofa-0.9.3.ebuild 970
+SHA256 d86dae2cbfbd963053589815c354bb9556c98b0876b376a86597db11dfbd4172 libofa-0.9.3.ebuild 970
+MISC ChangeLog 619 RMD160 5eb659f78c9f5d55220346a92475c970d247a3ca SHA1 3d38fcc2f26eaee74ef762740c98e178b0cb9567 SHA256 b75db17ad2bf9df478b9448f861d5c3195f75975875c954e41b90be8700b241f
+MD5 bb502f681eabad1e4c8f74815f6c6a84 ChangeLog 619
+RMD160 5eb659f78c9f5d55220346a92475c970d247a3ca ChangeLog 619
+SHA256 b75db17ad2bf9df478b9448f861d5c3195f75975875c954e41b90be8700b241f ChangeLog 619
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.patch
new file mode 100644
index 000000000000..d1059bafa55f
--- /dev/null
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.patch
@@ -0,0 +1,39 @@
+--- lib/JAMA/tnt_math_utils.h.orig	2006-06-17 01:46:22.000000000 +0300
++++ lib/JAMA/tnt_math_utils.h	2006-06-17 01:47:02.000000000 +0300
+@@ -20,11 +20,20 @@
+ namespace TNT

+ {

+ /**

++	@returns the absolute value of a real (no-complex) scalar.

++*/

++template <class Real>

++Real abs(const Real &a)

++{

++	return  (a > 0 ? a : -a);

++}

++/**

+ 	@returns hypotenuse of real (non-complex) scalars a and b by 

+ 	avoiding underflow/overflow

+ 	using (a * sqrt( 1 + (b/a) * (b/a))), rather than

+ 	sqrt(a*a + b*b).

+ */

++

+ template <class Real>

+ Real hypot(const Real &a, const Real &b)

+ {

+@@ -56,15 +65,6 @@
+ }

+ */

+ 

+-/**

+-	@returns the absolute value of a real (no-complex) scalar.

+-*/

+-template <class Real>

+-Real abs(const Real &a)

+-{

+-	return  (a > 0 ? a : -a);

+-}

+-

+ }

+ #endif

+ /* MATH_UTILS_H */

diff --git a/media-libs/libofa/libofa-0.9.3.ebuild b/media-libs/libofa/libofa-0.9.3.ebuild
index 72cedee298b6..bc5b634ddc51 100644
--- a/media-libs/libofa/libofa-0.9.3.ebuild
+++ b/media-libs/libofa/libofa-0.9.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 2006-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3.ebuild,v 1.2 2006/08/27 14:39:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3.ebuild,v 1.3 2006/08/30 18:57:50 carlo Exp $
+
+inherit eutils
 
 DESCRIPTION="Open Fingerprint Architecture"
 HOMEPAGE="http://www.musicdns.org/"
@@ -22,8 +24,14 @@ pkg_setup() {
 		die "Correct your C[XX]FLAGS. Using -ffast-math is unsafe and not supported."
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libofa-0.9.3-gcc-4.patch
+}
+
 src_compile() {
-	econf || die "configure failed"
+ 	econf || die "configure failed"
 	emake || die "emake failed"
 }
 src_install() {