Added a little patch for a single broken driver, see bug #168220

Package-Manager: portage-2.1.1-r2

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 51ad5b5d5d9fd2f55ad0dc6f34fb224a3346690c..51b1a0260c720de54cbffc1900f337daaeec2603 100644 (file)
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.112 2006/10/20 21:34:27 kloeri Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.113 2007/02/26 12:10:06 phosphan Exp $
+
+  26 Feb 2007; Patrick Kursawe <phosphan@gentoo.org>
+  +files/broken_coolscan.patch, sane-backends-1.0.18-r2.ebuild:
+  Added a little patch for a single broken driver, see bug #168220
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   sane-backends-1.0.18-r2.ebuild:

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 3ff08cb654908b435d7b7e790a4c2a36d23c4305..be6a96f1424a908893becafdb213ead0cf108db9 100644 (file)
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,3 +1,7 @@
+AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
+MD5 7cf37ee795b044d46571cdf4a52ce8ac files/broken_coolscan.patch 442
+RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab files/broken_coolscan.patch 442
+SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98 files/broken_coolscan.patch 442
 AUX canoscan-focus.patch 472 RMD160 02a2734222e4725133150ca6c4b33491c5c47167 SHA1 dbfc6b2262799dd075cdc565627908afddb8055c SHA256 7abe4ab754f48c079c5ebffce4f15b84d5784ad0d4e1235e6f96fa308d71dea4
 MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
 RMD160 02a2734222e4725133150ca6c4b33491c5c47167 files/canoscan-focus.patch 472
@@ -41,18 +45,18 @@ EBUILD sane-backends-1.0.17.ebuild 3858 RMD160 e36f305c9d651979131c05a4e9b3dfe97
 MD5 127776e6ae274020db9accb70da954e2 sane-backends-1.0.17.ebuild 3858
 RMD160 e36f305c9d651979131c05a4e9b3dfe976ca757d sane-backends-1.0.17.ebuild 3858
 SHA256 606ca4844d881442e17b10e4656b2edd21fa32c74de7b1300d944b42ddf9a544 sane-backends-1.0.17.ebuild 3858
-EBUILD sane-backends-1.0.18-r2.ebuild 4039 RMD160 4db06efc29453451696a5b1708214a2283ea060e SHA1 3175c641c1caaf0d3798e0370fae9fec1aa254b6 SHA256 57810f429482a822bf68e55eb4a517358233e69de4a35661cb0b68f17b128ca6
-MD5 21bdbc97e3f81413eda93cfc7a6c35da sane-backends-1.0.18-r2.ebuild 4039
-RMD160 4db06efc29453451696a5b1708214a2283ea060e sane-backends-1.0.18-r2.ebuild 4039
-SHA256 57810f429482a822bf68e55eb4a517358233e69de4a35661cb0b68f17b128ca6 sane-backends-1.0.18-r2.ebuild 4039
+EBUILD sane-backends-1.0.18-r2.ebuild 4084 RMD160 a6f1c67b3a36019307105a7a546b4ec5aed12ac0 SHA1 449da688e38ad791d1ee043d46d6efcc64e59bff SHA256 e67bf9be3807d586a792149bd5c3be06b30debf03a892afe9863a771863eaf20
+MD5 9a498af1cef3e87c748147253f7e7947 sane-backends-1.0.18-r2.ebuild 4084
+RMD160 a6f1c67b3a36019307105a7a546b4ec5aed12ac0 sane-backends-1.0.18-r2.ebuild 4084
+SHA256 e67bf9be3807d586a792149bd5c3be06b30debf03a892afe9863a771863eaf20 sane-backends-1.0.18-r2.ebuild 4084
 EBUILD sane-backends-1.0.18.ebuild 3835 RMD160 8c2ac977c9bbe816cb8e673db8ef3ab1d81dde67 SHA1 b4a5ee1e268d06a02cc7ae0435a2f8b18a7cea08 SHA256 023f2d31bc194e592d49a45022641ad51e605955e29bfd408df46b50b75654d9
 MD5 89434813e78f7d724513298ff54ca454 sane-backends-1.0.18.ebuild 3835
 RMD160 8c2ac977c9bbe816cb8e673db8ef3ab1d81dde67 sane-backends-1.0.18.ebuild 3835
 SHA256 023f2d31bc194e592d49a45022641ad51e605955e29bfd408df46b50b75654d9 sane-backends-1.0.18.ebuild 3835
-MISC ChangeLog 18812 RMD160 76e3b37cb770a6134264e9d309ed5f1107e59c30 SHA1 509c49768866bb66ff9a9f86dbf6edb211903bd4 SHA256 03724f44d1d57067f026163b817d8725210cf9b73f83edd81e13c5f7a18a3964
-MD5 cc0056d4d028955faf7484696ca15253 ChangeLog 18812
-RMD160 76e3b37cb770a6134264e9d309ed5f1107e59c30 ChangeLog 18812
-SHA256 03724f44d1d57067f026163b817d8725210cf9b73f83edd81e13c5f7a18a3964 ChangeLog 18812
+MISC ChangeLog 18999 RMD160 6a943ca051296cc162dfba8d140667211f23fc69 SHA1 44d733d7d28045ec586a6e00ed1d87fa03002990 SHA256 b7338fc0058ba022d53fabf2616ab1e35c0358c04ac508a06de188f56c6a6b22
+MD5 1f07ed85a300aff5fd374ccdf207b0b8 ChangeLog 18999
+RMD160 6a943ca051296cc162dfba8d140667211f23fc69 ChangeLog 18999
+SHA256 b7338fc0058ba022d53fabf2616ab1e35c0358c04ac508a06de188f56c6a6b22 ChangeLog 18999
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 RMD160 d646bef174a902fd1910871e794292c44f292052 metadata.xml 224

diff --git a/media-gfx/sane-backends/files/broken_coolscan.patch b/media-gfx/sane-backends/files/broken_coolscan.patch
new file mode 100644 (file)
index 0000000..d10a7ed
--- /dev/null
+++ b/media-gfx/sane-backends/files/broken_coolscan.patch
@@ -0,0 +1,18 @@
+--- backend/coolscan2.c        2006-06-11 20:39:40.000000000 +0200
++++ backend/coolscan2.c.new    2007-02-26 12:29:15.000000000 +0100
+@@ -1482,6 +1482,7 @@
+       if (xfer_len_out == 0)  /* no more data */
+       {
+         *len = 0;
++        s->scanning = SANE_FALSE;
+         return SANE_STATUS_EOF;
+       }
+ 
+@@ -1533,6 +1534,7 @@
+   if (xfer_len_line == 0)     /* no more data */
+     {
+       *len = 0;
++      s->scanning = SANE_FALSE;
+       return SANE_STATUS_EOF;
+     }
+ 

diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
index 0a5cbffec08f50954d15c780b929b0bf817e0559..7e33a5fe941f97377d0718f34a1c600af9dabeda 100644 (file)
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.18-r2.ebuild,v 1.9 2006/10/20 21:34:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild,v 1.10 2007/02/26 12:10:06 phosphan Exp $
 
 inherit eutils
 
@@ -90,6 +90,7 @@ src_unpack() {
                        die "could not add 'brother' to backend list"
        fi
        epatch ${FILESDIR}/udev-rule.patch
+       epatch ${FILESDIR}/broken_coolscan.patch
 }
 
 src_compile() {