Getting to the root of the problem for -ffast-math (bug #103118)

(Portage version: 2.0.51.22-r2)

3 files changed, 35 insertions, 20 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 9cfd678c8bde..b75cb58ef516 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.78 2005/09/17 14:48:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.79 2005/09/19 15:50:40 phosphan Exp $
+
+  19 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.16-r2.ebuild:
+  Getting to the root of the problem for -ffast-math (bug #103118)
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ChangeLog:
   Mark 1.0.15-r3 stable on ia64
@@ -94,7 +98,7 @@
   sane-backends-1.0.15.ebuild:
   Fixed BUG #86354 (multilib-strict). Marked stable on amd64.
 
-  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
   sane-backends-1.0.15.ebuild:
   Stable on alpha.
 
@@ -115,7 +119,7 @@
   sane-backends-1.0.14-r6.ebuild, sane-backends-1.0.15.ebuild:
   Update homepage to http://www.sane-project.org/
 
-  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
   sane-backends-1.0.15.ebuild:
   ~alpha keyword.
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 9c2ce21f90dd..182f0a8941cd 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,22 +1,22 @@
-MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
-MD5 aaf72b7039e24a333c0b49aa1c08c179 ChangeLog 13654
-MD5 61d573be9593ba3be2da335586ac7eb2 sane-backends-1.0.16-r1.ebuild 3743
-MD5 60e44501c1cb8c8a1aeca03fedece7c8 sane-backends-1.0.16-r2.ebuild 3913
+MD5 833d0606e74bfc5cd62f7afb552c2992 sane-backends-1.0.16-r2.ebuild 4297
 MD5 ebd00143bfe66f76d0d0da95cbc84923 sane-backends-1.0.15.ebuild 2598
-MD5 bf9d1f03f70dfafd088f5b106c8a3108 sane-backends-1.0.15-r3.ebuild 3974
+MD5 544c2bc7c5a23b2ae8280b879eac1fbb sane-backends-1.0.15-r2.ebuild 3912
 MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
+MD5 61d573be9593ba3be2da335586ac7eb2 sane-backends-1.0.16-r1.ebuild 3743
 MD5 e73a3bf54c049342701898a62ea3b301 sane-backends-1.0.15-r1.ebuild 2674
-MD5 544c2bc7c5a23b2ae8280b879eac1fbb sane-backends-1.0.15-r2.ebuild 3912
-MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r2 151
+MD5 04e4612ac0608021a1f3619264230e1b ChangeLog 13813
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 bf9d1f03f70dfafd088f5b106c8a3108 sane-backends-1.0.15-r3.ebuild 3974
+MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
+MD5 f49c8e2b591496e87e91ae243d9864d0 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
 MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
-MD5 d16f7594dad0db0c268e143c3676041e files/digest-sane-backends-1.0.15-r3 220
+MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
+MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
+MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r1 157
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r2 157
-MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
-MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
-MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
+MD5 d16f7594dad0db0c268e143c3676041e files/digest-sane-backends-1.0.15-r3 220
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r1 151
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r2 151
 MD5 0bc1f6b8682b5585c8e87a325f983ade files/lide25.patch 5565
-MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
-MD5 f49c8e2b591496e87e91ae243d9864d0 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
-MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r1 151
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
index 328acd67345b..4fc861fc3760 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild,v 1.3 2005/09/12 06:34:54 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild,v 1.4 2005/09/19 15:50:40 phosphan Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,13 +9,16 @@ IUSE="usb gphoto2 ipv6 v4l"
 DESCRIPTION="Scanner Access Now Easy - Backends"
 HOMEPAGE="http://www.sane-project.org/"
 
-DEPEND=">=media-libs/jpeg-6b
+RDEPEND=">=media-libs/jpeg-6b
 	amd64? ( sys-libs/libieee1284 )
 	x86? ( sys-libs/libieee1284 )
 	usb? ( dev-libs/libusb )
 	gphoto2? ( media-libs/libgphoto2 )
 	v4l? ( sys-kernel/linux-headers )"
 
+DEPEND="${DEPEND}
+	>=sys-apps/sed-4"
+
 BROTHERMFCDRIVER="sane-${PV}-brother-driver.diff"
 
 SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
@@ -85,10 +88,18 @@ src_unpack() {
 		:
 	fi
 	epatch ${FILESDIR}/lide25.patch
+
+	# trouble with -ffast-math, see bug #103118
+	for file in backend/matsushita.c backend/sceptre.c backend/leo.c \
+		backend/sp15c.h backend/teco1.c backend/teco2.c backend/teco3.c \
+		backend/sp15c-scsi.h backend/dc210.c include/sane/sanei_backend.h; do
+			sed -e 's/__unused__/sane_unused__/g' -i ${file} || \
+				die "Could not apply __unused__-fix for ${file}"
+	done
+
 }
 
 src_compile() {
-	filter-flags -ffast-math
 	if use amd64; then
 		filter-flags -fstack-protector
 	fi