libieee1284 was always linked with, see bug #283341.

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

4 files changed, 15 insertions, 7 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 3829d821c718..411a4e2e6554 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.169 2010/03/09 20:26:39 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.170 2010/04/02 22:15:15 phosphan Exp $
+
+  02 Apr 2010; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.20-r3.ebuild:
+  libieee1284 was always linked with, see bug #283341.
 
   09 Mar 2010; Patrick Kursawe <phosphan@gentoo.org>
   -sane-backends-1.0.19-r1.ebuild, -sane-backends-1.0.20.ebuild,
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 739091e6f6d8..8059c471f7a3 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -16,7 +16,8 @@ DIST sane-backends-1.0.19.tar.gz 4293184 RMD160 1aaf304cbfeb3d6c95f6081d04225441
 DIST sane-backends-1.0.20.tar.gz 4760873 RMD160 b80c0a15a75b3bce07060d65aecdcaf7860c323b SHA1 3b4d2ecde8be404bb44269771cf5dc6e4c10b086 SHA256 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
 EBUILD sane-backends-1.0.17.ebuild 3769 RMD160 aaeaa544e2ff07ee3c56c6fc48c0c85b28374e62 SHA1 a2060c1a3c6acb973784e8244ccd064ec4465e07 SHA256 6c4264dccbab4f098f02045166ecdfb514abc20ba707e5fe8dbeeb24f2133c55
 EBUILD sane-backends-1.0.18-r6.ebuild 4278 RMD160 6813867226c83bacea836184ac70cf1b77fffe17 SHA1 a573b3639310b109360cdc29a24261e2059cbd9e SHA256 b9a5718ea3c36f15de7025b50a0812ae851d7ccf8cc5737f69e55a4a94f18157
-EBUILD sane-backends-1.0.19-r2.ebuild 4482 RMD160 e9139e5efc0c9eadf07b4ed4d88e40e62401246d SHA1 2c15f4318c477c9d959acaf26f026cbb04683991 SHA256 babc258bbfb6cf0edbea22e5b85fd9b2d9f6f0113eddc8471ad545d926b2c7ac
-EBUILD sane-backends-1.0.20-r3.ebuild 4300 RMD160 4262c8b8846f129d0d3d386804e36d40425d41b5 SHA1 417a9a60c3d106f802b016e8e10e99503e248893 SHA256 9ef4baf228734efb247e6664db61b4c8d13d749e8ca1888e67a641f943fce5fe
-MISC ChangeLog 28757 RMD160 add89786c295992220e57d694042ed18640ccf4e SHA1 666c1fcd4d091fd24fed01d02cbd587ae447822c SHA256 8cb9bb42ab1ff94504a9d993820d280275a3c985483d30624d173b60c5dfc22e
+EBUILD sane-backends-1.0.19-r2.ebuild 4482 RMD160 c51a3f8765aaf0a69dbeb82c9aa30a30f1524d11 SHA1 4855d517efab381053569a4f86d9db947572d4dc SHA256 a93c515f00c38e1ef73765a226cdcca69c99376f927b06e04438d4b57c6f77b1
+EBUILD sane-backends-1.0.20-r3.ebuild 4453 RMD160 299a030d8c9b7b2bef01e2d293abecdf901acbaa SHA1 c9da6064b0ba9f52844f81b29f434b065d81136b SHA256 8cca6a45025b1dec842f84541592b0c06009ee955a08f08383a4bbdbc1633db1
+MISC ChangeLog 28900 RMD160 cce39f56e8ba7ee50bc97a022cb4cba727f1db1b SHA1 5702b4e90dacc9e545c78fa3cdcb037add97b499 SHA256 d6b92420c3c9ff73335e263589a84a90414db79f4a825cff67b779fd50fed99c
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
+MISC sane-backends-1.0.19-r2.ebuild.orig 4482 RMD160 e9139e5efc0c9eadf07b4ed4d88e40e62401246d SHA1 2c15f4318c477c9d959acaf26f026cbb04683991 SHA256 babc258bbfb6cf0edbea22e5b85fd9b2d9f6f0113eddc8471ad545d926b2c7ac
diff --git a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
index 676b5972edc1..1a11e3e2f224 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.19-r2.ebuild,v 1.14 2009/06/18 20:07:03 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild,v 1.15 2010/04/02 22:15:15 phosphan Exp $
 
 EAPI="1"
 
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
index 71669e18d3d3..8e0fb8ebf25f 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.20-r3.ebuild,v 1.3 2010/02/14 19:55:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild,v 1.4 2010/04/02 22:15:15 phosphan Exp $
 
 EAPI="1"
 
@@ -168,6 +168,9 @@ src_compile() {
 	if use sane_backends_mustek_pp; then
 		myconf="${myconf} --enable-parport-directio"
 	fi
+	if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then
+		myconf="${myconf} sane_cv_use_libieee1284=no"
+	fi
 	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
 	BACKENDS="${BACKENDS}" econf \
 		$(use_with gphoto2) \