Cleanup, dodoc fixes (bug #141924) and adding udev rules in .18-r1.

(Portage version: 2.1)
 (Unsigned Manifest commit)

9 files changed, 23 insertions, 916 deletions

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c6acc6f39422..a0a001af2b70 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 SHA256 7abe4ab754f48c079c5ebffce4f15b84d5784ad0d4e1235e6f96fa308d71dea4 files/canoscan-focus.patch 472
-AUX kernel2.6.13usb-problem.patch 1125 RMD160 dfb698fc7236bda35259911f999b9debb8cc507f SHA1 47b9349eabd9fb24e1566e7954f6db93b473298c SHA256 670428160dcefa4d0dc0cb9e6f2a605e4ee2e8e07941daf6c17a7d8f2bdb1158
-MD5 3c9eec3f3f2e73bd6228f946f41c08b8 files/kernel2.6.13usb-problem.patch 1125
-RMD160 dfb698fc7236bda35259911f999b9debb8cc507f files/kernel2.6.13usb-problem.patch 1125
-SHA256 670428160dcefa4d0dc0cb9e6f2a605e4ee2e8e07941daf6c17a7d8f2bdb1158 files/kernel2.6.13usb-problem.patch 1125
 AUX libusbscanner-device-r1.patch 681 RMD160 ab1932275a1970a9163d5972f851430220efeb8f SHA1 c624158a73081a31c793948025ed19bc49c6b025 SHA256 8a0d477fce2c683692a89df996cf72d379be7e0672a1f7552511d20cc167baa6
 MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
 RMD160 ab1932275a1970a9163d5972f851430220efeb8f files/libusbscanner-device-r1.patch 681
@@ -17,14 +10,6 @@ AUX libusbscanner-device.patch 582 RMD160 ca00fbf16ccaea368daa478d448b22388811cc
 MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
 RMD160 ca00fbf16ccaea368daa478d448b22388811cc2b files/libusbscanner-device.patch 582
 SHA256 31caa1b205aa573d1f39f12567af9d769dd27d8c46a3d373944c0b4cc3e79b15 files/libusbscanner-device.patch 582
-AUX lide25-r1.patch 7949 RMD160 6b45034603d9ec9caaf60df0d0e0bd94133515ea SHA1 d20a35ba6e78c90d7801c3419fbe4d6f2659ab9f SHA256 86081e1488e63182b138e4b01530c15a468e78b4b8b84e7e0bd1546d623334ed
-MD5 bd0e1ecf807f1e676c4466f12cac215a files/lide25-r1.patch 7949
-RMD160 6b45034603d9ec9caaf60df0d0e0bd94133515ea files/lide25-r1.patch 7949
-SHA256 86081e1488e63182b138e4b01530c15a468e78b4b8b84e7e0bd1546d623334ed files/lide25-r1.patch 7949
-AUX lide25.patch 5565 RMD160 be65dcd4578865b15b2603f3c21f1086895f9119 SHA1 44d805aa40d2d42dcee2142b7462a2f280095b02 SHA256 34ab305ad66390e7d124ee853cc7f727c4d01ca34cdc3870ca42bcf293b52634
-MD5 0bc1f6b8682b5585c8e87a325f983ade files/lide25.patch 5565
-RMD160 be65dcd4578865b15b2603f3c21f1086895f9119 files/lide25.patch 5565
-SHA256 34ab305ad66390e7d124ee853cc7f727c4d01ca34cdc3870ca42bcf293b52634 files/lide25.patch 5565
 AUX linux_sg3_err.h 4894 RMD160 8fe500bdd03127876a13e16772f6570cef310197 SHA1 71639851eebe9094fdcc79cd804ca32b954008c1 SHA256 a90f0d768c735d918a7b90bbf80b55a3d12fa03d0ef6d2a6320934132f9c483a
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
 RMD160 8fe500bdd03127876a13e16772f6570cef310197 files/linux_sg3_err.h 4894
@@ -33,24 +18,17 @@ AUX sane-backend-1.0.15-gt68xx-update67.patch 5682 RMD160 dc790785e9a4893c73ef20
 MD5 f49c8e2b591496e87e91ae243d9864d0 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
 RMD160 dc790785e9a4893c73ef2028fd0414009ee9dd37 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
 SHA256 9d7a19e48493516ca0e288ee19dd4321d2dbfd8906b677eff5d1fd7b66c94851 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
-AUX sm3600usb.patch 7815 RMD160 b842ace60fe94cd3fa848ad707f54481aa857f4e SHA1 2844f2a6f5c00eca589bbb4e74c067fd3d877bdd SHA256 3be6146efb7dd133b4f77dd7fbbef1843aa37e529bbaab81a2470b36c2a13396
-MD5 76ecccefb14f182ef419873f26693129 files/sm3600usb.patch 7815
-RMD160 b842ace60fe94cd3fa848ad707f54481aa857f4e files/sm3600usb.patch 7815
-SHA256 3be6146efb7dd133b4f77dd7fbbef1843aa37e529bbaab81a2470b36c2a13396 files/sm3600usb.patch 7815
+AUX scsi-udev-rule.patch 703 RMD160 b4622363fbf3086da3d108fd5d0bcdf0063edd7a SHA1 24e53c55380a79456de11739918492fdb942a25d SHA256 f6755d24f0a38d73d518510e0ef38e26d38a540a85f177558656f2927eb8540b
+MD5 09635367e2d86bacf8efa2a7927e5f5f files/scsi-udev-rule.patch 703
+RMD160 b4622363fbf3086da3d108fd5d0bcdf0063edd7a files/scsi-udev-rule.patch 703
+SHA256 f6755d24f0a38d73d518510e0ef38e26d38a540a85f177558656f2927eb8540b files/scsi-udev-rule.patch 703
 DIST gt68xx-71.patch.bz2 20694 RMD160 0c33826b6d0e3a44bc1a243fd208826192f10fef SHA1 ab28a3a6bf40c870c296bc9bda045904505315bd SHA256 6cb6a4228927d44d400dfa81d39ed312d126c143022953ed688a69994e23ac66
 DIST sane-1.0.16-brother-driver.diff.bz2 8224 RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f SHA1 2f0cf77d8bbb98b9bb6cc1f56a86f662fa9bda48 SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe
 DIST sane-1.0.18-brother-driver.diff.bz2 8335 RMD160 8d86dccca4054699e367412c25d80d8641de42ca SHA1 60bf9c8d4b2fac3f250a95d1dc8043662fc974cd SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b
-DIST sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
-DIST sane-backends-1.0.13.tar.gz 3108639
 DIST sane-backends-1.0.15-brothermfc.patch.bz2 9753 RMD160 83e388f8dc14af8c18296186d8983ff856e4487a SHA1 6382738710e092a6bbc78e0f77ba104d58f00a0b SHA256 afd0bf3cd17ce9240c2af0c2ecddc7ca8379ac70010330f4e7f3248325b35a6a
 DIST sane-backends-1.0.15.tar.gz 3231759 RMD160 0e42007ff24d0a5f94c7c901982619cf4d1a7068 SHA1 521bdeacbab389a6fd67f16123e09b9f86752169 SHA256 89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe
-DIST sane-backends-1.0.16.tar.gz 3409799 RMD160 694030faddf3b14035b6d4cee0151aa48f71049d SHA1 38e2bf7aef648f3ea19bd6c89af2c2fdd8b6eeb1 SHA256 85c2720c4417cfe72e4bf8917f84173792b70b834a23fb61c790c6a85b67f036
 DIST sane-backends-1.0.17.tar.gz 3588993 RMD160 43e440712e9da676e235dc6148c5dda347c30e22 SHA1 a73e01575458a5fb7dc265cea50c6740555e1711 SHA256 f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77
 DIST sane-backends-1.0.18.tar.gz 3789493 RMD160 aa863adff417d7c33cbb85c193878aa54a056100 SHA1 f4c360b87ced287e4015a0dafd766ad885c539e1 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
-EBUILD sane-backends-1.0.13-r3.ebuild 1717 RMD160 a561437bfadb6302a9002ea0f389b0bd1f7df666 SHA1 01ecc0f2ffec39981e5e3c9aa6df6a3cd3b12acf SHA256 0d181ab8d2cbb5858681538be7da6bf8bae4ec94a442c2073c9ed7834c445e0c
-MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
-RMD160 a561437bfadb6302a9002ea0f389b0bd1f7df666 sane-backends-1.0.13-r3.ebuild 1717
-SHA256 0d181ab8d2cbb5858681538be7da6bf8bae4ec94a442c2073c9ed7834c445e0c sane-backends-1.0.13-r3.ebuild 1717
 EBUILD sane-backends-1.0.15-r3.ebuild 3971 RMD160 a2cb065433b535fc43fe278d9fd12376cf412aae SHA1 f20879a3636550b436c464c009aa2bcbd721e41a SHA256 72b8d6a9bd78c640e2d81858ae7b90af2bc1a357274e0e8d0927bcea85860946
 MD5 faf6bd7e05c7d17b57793f8f3ebf5b2e sane-backends-1.0.15-r3.ebuild 3971
 RMD160 a2cb065433b535fc43fe278d9fd12376cf412aae sane-backends-1.0.15-r3.ebuild 3971
@@ -59,48 +37,38 @@ EBUILD sane-backends-1.0.15.ebuild 2598 RMD160 cc9a6e1e354edf5fffd1b16c63e414ab7
 MD5 e898804ea6825104b162de2ad41593ef sane-backends-1.0.15.ebuild 2598
 RMD160 cc9a6e1e354edf5fffd1b16c63e414ab7883f67d sane-backends-1.0.15.ebuild 2598
 SHA256 9b4c2a259d8789f24f0836b0c468c0408615fc371a89817af9b394119acafdb7 sane-backends-1.0.15.ebuild 2598
-EBUILD sane-backends-1.0.16-r4.ebuild 4386 RMD160 26dbb1bbdf41ef0abda862ca1682eb53dbcb9b41 SHA1 5ad5a98f440f07fc80ec16ffdf8c133ac056b89f SHA256 829f4b217fa2f428dc4d0e9de2828ed20709701a35b133e146065b2f459307dd
-MD5 8c23aab107d4c5424e32e24123d4811f sane-backends-1.0.16-r4.ebuild 4386
-RMD160 26dbb1bbdf41ef0abda862ca1682eb53dbcb9b41 sane-backends-1.0.16-r4.ebuild 4386
-SHA256 829f4b217fa2f428dc4d0e9de2828ed20709701a35b133e146065b2f459307dd sane-backends-1.0.16-r4.ebuild 4386
-EBUILD sane-backends-1.0.17.ebuild 3882 RMD160 4a9f1dd232c11be69b431618594fd57ea64eb075 SHA1 ac5df0db84f8ebf4e6b708b0a7436dda1bfdd3d2 SHA256 d038268af4dc2e3275bca0ec5c7fd2974ac3a63e93ec6838be4c623881a229a1
-MD5 c289697ae2ccabb2d2fd3c0a9e23167f sane-backends-1.0.17.ebuild 3882
-RMD160 4a9f1dd232c11be69b431618594fd57ea64eb075 sane-backends-1.0.17.ebuild 3882
-SHA256 d038268af4dc2e3275bca0ec5c7fd2974ac3a63e93ec6838be4c623881a229a1 sane-backends-1.0.17.ebuild 3882
-EBUILD sane-backends-1.0.18.ebuild 3886 RMD160 6dea4dd0fe2354f5bab1ecdb655339077f8942c7 SHA1 58f33e0bd606d851e73fa2bd916edfac9686e8ab SHA256 f13264975cee4da2d71b6203613a56c79075606ab331b8606c8700a27d76b417
-MD5 dd8d91db455aff8ac8b7422a7116c3a8 sane-backends-1.0.18.ebuild 3886
-RMD160 6dea4dd0fe2354f5bab1ecdb655339077f8942c7 sane-backends-1.0.18.ebuild 3886
-SHA256 f13264975cee4da2d71b6203613a56c79075606ab331b8606c8700a27d76b417 sane-backends-1.0.18.ebuild 3886
-MISC ChangeLog 16849 RMD160 3447bfe247772850168779c6fb2d151764614277 SHA1 1041c651917203f5b14cf04a4078b6cbdacad678 SHA256 79a5cfa2b4c3dfbb6fc2b4fe21003daa857ce898e8d9772d6892ff33d1578c0e
-MD5 a48fc71bbfec5f4d80deeb124f19e9d7 ChangeLog 16849
-RMD160 3447bfe247772850168779c6fb2d151764614277 ChangeLog 16849
-SHA256 79a5cfa2b4c3dfbb6fc2b4fe21003daa857ce898e8d9772d6892ff33d1578c0e ChangeLog 16849
+EBUILD sane-backends-1.0.17.ebuild 3862 RMD160 2393b323221b013862b58221e70d08393c1b6e90 SHA1 76e08e8eb0fa51c69d1c27f014d51e4615cac0de SHA256 169be396b4eab9fbf953cb06e4d84e552a4b2e595cf748bac5b75052ad83ba5f
+MD5 5ccfb26632e93c96bea317b10dbb6b32 sane-backends-1.0.17.ebuild 3862
+RMD160 2393b323221b013862b58221e70d08393c1b6e90 sane-backends-1.0.17.ebuild 3862
+SHA256 169be396b4eab9fbf953cb06e4d84e552a4b2e595cf748bac5b75052ad83ba5f sane-backends-1.0.17.ebuild 3862
+EBUILD sane-backends-1.0.18-r1.ebuild 4054 RMD160 434a917107fc0a03b77545a1e125e02053575180 SHA1 8e4d6bbefb021ff0fd308b4b72b85f9ac3f89de0 SHA256 5d0f820ac2a64be9e680a9745d8b2e0762cbc01461c21906e3e7d4cc68a31cc7
+MD5 77e01e00969cf76ad90395d6aa0e8acc sane-backends-1.0.18-r1.ebuild 4054
+RMD160 434a917107fc0a03b77545a1e125e02053575180 sane-backends-1.0.18-r1.ebuild 4054
+SHA256 5d0f820ac2a64be9e680a9745d8b2e0762cbc01461c21906e3e7d4cc68a31cc7 sane-backends-1.0.18-r1.ebuild 4054
+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 17405 RMD160 e1c2d119375e268fb7652f9b81ad3e954986a88e SHA1 fee2e37c92235df8419741c57408e449ad7ba6dc SHA256 67785729057ab4f3f57200857caf2d90e074dc5ea66eb6b4c85092cbcd66bb63
+MD5 7817a673d5a0d91e9404f159e2da3808 ChangeLog 17405
+RMD160 e1c2d119375e268fb7652f9b81ad3e954986a88e ChangeLog 17405
+SHA256 67785729057ab4f3f57200857caf2d90e074dc5ea66eb6b4c85092cbcd66bb63 ChangeLog 17405
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 RMD160 d646bef174a902fd1910871e794292c44f292052 metadata.xml 224
 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822 metadata.xml 224
-MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
-RMD160 6a6d81dc1b6f4bb7feeb7962bff1a9043ab1695c files/digest-sane-backends-1.0.13-r3 160
-SHA256 4966898ae53e5a506c17a9b5f689ee6bcf5c920e94efcb554de3ae5189e6fe09 files/digest-sane-backends-1.0.13-r3 160
 MD5 f6255592ca97f5f4285a5c95afd761c7 files/digest-sane-backends-1.0.15 563
 RMD160 d7606042e8795dd686c21f17cc7463e088341e5c files/digest-sane-backends-1.0.15 563
 SHA256 69b6ad295ceab64e179b1a3982e3053e279bc6db8392c037dd4a0f2dd12fae7b files/digest-sane-backends-1.0.15 563
 MD5 214948432c54700c98c4cd337549e64e files/digest-sane-backends-1.0.15-r3 798
 RMD160 62f762d9decd7b7f6fcb6b434bd192537ed6ef71 files/digest-sane-backends-1.0.15-r3 798
 SHA256 9588c58aeb8c1876f049876803b99794b5e0926fb3a05309753b6242a0b4db94 files/digest-sane-backends-1.0.15-r3 798
-MD5 51f417fd27b38cff8cc0b32552173a6d files/digest-sane-backends-1.0.16-r4 545
-RMD160 bf95b5a72bb7982dfd0157f7c454ac0b50323de1 files/digest-sane-backends-1.0.16-r4 545
-SHA256 61d03a617bd662000c9d74bb450a166d0e04bf635e58bda5b44172bcf1c3c7e2 files/digest-sane-backends-1.0.16-r4 545
 MD5 96cd93393228e66edd7dbea72cac58cc files/digest-sane-backends-1.0.17 545
 RMD160 b870520524066d0ce38231558b644f3bd17514a4 files/digest-sane-backends-1.0.17 545
 SHA256 2e34b33618661e8e23c7cee3d878bf759aa155250aec9f14d3c4ee1dd1eaac48 files/digest-sane-backends-1.0.17 545
 MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18 545
 RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18 545
 SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18 545
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEyDUe2ZWR0Jhg/EsRAhotAJkBUp55mhqPyRJVAquBFMvrIBy3mgCbBg4k
-4KhF4hg7sE+CgRS3xnysRWM=
-=cedK
------END PGP SIGNATURE-----
+MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18-r1 545
+RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18-r1 545
+SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18-r1 545
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r3
deleted file mode 100644
index 63e10ba5a99b..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a158413180a752f8af6f11792154a42 sane-backends-1.0.13.tar.gz 3108639
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r4 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r4
deleted file mode 100644
index 69062c4abd55..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
-RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f sane-1.0.16-brother-driver.diff.bz2 8224
-SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe sane-1.0.16-brother-driver.diff.bz2 8224
-MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
-RMD160 694030faddf3b14035b6d4cee0151aa48f71049d sane-backends-1.0.16.tar.gz 3409799
-SHA256 85c2720c4417cfe72e4bf8917f84173792b70b834a23fb61c790c6a85b67f036 sane-backends-1.0.16.tar.gz 3409799
diff --git a/media-gfx/sane-backends/files/kernel2.6.13usb-problem.patch b/media-gfx/sane-backends/files/kernel2.6.13usb-problem.patch
deleted file mode 100644
index 633cc36f54a2..000000000000
--- a/media-gfx/sane-backends/files/kernel2.6.13usb-problem.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u -r1.42 -r1.43
---- sanei/sanei_usb.c	9 Aug 2005 16:28:38 -0000	1.42
-+++ sanei/sanei_usb.c	23 Sep 2005 12:52:35 -0000	1.43
-@@ -1,6 +1,6 @@
- /* sane - Scanner Access Now Easy.
-    Copyright (C) 2003 Rene Rebe (sanei_read_int,sanei_set_timeout)
--   Copyright (C) 2001 - 2003 Henning Meier-Geinitz
-+   Copyright (C) 2001 - 2005 Henning Meier-Geinitz
-    Copyright (C) 2001 Frank Zago (sanei_usb_control_msg)
-    Copyright (C) 2005 Paul Smedley <paul@smedley.info> (OS/2 usbcalls)
-    This file is part of the SANE package.
-@@ -760,12 +760,15 @@
- 	    }
- 	  else if (errno == EBUSY)
- 	    {
--	      DBG (1, "Maybe the kernel scanner driver claims the "
--		   "scanner's interface?\n");
--	      status = SANE_STATUS_DEVICE_BUSY;
-+	      DBG (3, "Maybe the kernel scanner driver or usblp claims the "
-+		   "interface? Ignoring this error...\n");
-+	      status = SANE_STATUS_GOOD;
-+	    }
-+	  if (status != SANE_STATUS_GOOD)
-+	    {
-+	      usb_close (devices[devcount].libusb_handle);
-+	      return status;
- 	    }
--	  usb_close (devices[devcount].libusb_handle);
--	  return status;
- 	}
- 
-       /* Claim the interface */
diff --git a/media-gfx/sane-backends/files/lide25-r1.patch b/media-gfx/sane-backends/files/lide25-r1.patch
deleted file mode 100644
index ba750f014240..000000000000
--- a/media-gfx/sane-backends/files/lide25-r1.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -Nur sane-backends-1.0.16/backend/plustek-usb.c sane-backends-lide25v2/backend/plustek-usb.c
---- sane-backends-1.0.16/backend/plustek-usb.c	2005-07-04 18:59:54.000000000 +0200
-+++ sane-backends-lide25v2/backend/plustek-usb.c	2005-10-25 12:19:03.601593864 +0200
-@@ -880,11 +880,13 @@
- 
- 	if( si->ImgDef.wDataType == COLOR_256GRAY ) {
- 
--		if( !(si->ImgDef.dwFlag & SCANDEF_Adf ) &&
--		  (dev->usbDev.Caps.OpticDpi.x == 1200 && si->ImgDef.xyDpi.x <= 300)) {
--			dev->scanning.fGrayFromColor = 2;
--			si->ImgDef.wDataType = COLOR_TRUE24;
--			DBG( _DBG_INFO, "* Gray from color set!\n" );
-+		if((dev->usbDev.vendor != 0x04A9) && (dev->usbDev.product != 0x2220)) {
-+			if( !(si->ImgDef.dwFlag & SCANDEF_Adf ) &&
-+			  (dev->usbDev.Caps.OpticDpi.x==1200 && si->ImgDef.xyDpi.x<=300)) {
-+				dev->scanning.fGrayFromColor = 2;
-+				si->ImgDef.wDataType = COLOR_TRUE24;
-+				DBG( _DBG_INFO, "* Gray from color set!\n" );
-+			}
- 		}
- 
- 		if( caps->workaroundFlag & _WAF_GRAY_FROM_COLOR ) {
-@@ -1094,7 +1096,8 @@
- 	/* the CanoScan CIS devices need special handling... */
- 	if((dev->usbDev.vendor == 0x04A9) &&    
- 		(dev->usbDev.product==0x2206 || dev->usbDev.product==0x2207 ||
--		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E)) {
-+		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E ||
-+		 dev->usbDev.product==0x2220)) {
- 		use_alt_cal = SANE_TRUE;
- 		
- 	} else {
-diff -Nur sane-backends-1.0.16/backend/plustek-usbdevs.c sane-backends-lide25v2/backend/plustek-usbdevs.c
---- sane-backends-1.0.16/backend/plustek-usbdevs.c	2005-07-04 18:59:54.000000000 +0200
-+++ sane-backends-lide25v2/backend/plustek-usbdevs.c	2005-10-25 12:19:03.598594320 +0200
-@@ -702,6 +702,24 @@
- 	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
- };
- 
-+/* Canon LiDE25
-+ */
-+static DCapsDef Cap0x04A9_0x2220 =
-+{
-+	{{ 0, 100}, 50, 10, {2550, 3508}, {75, 75}, COLOR_BW },
-+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
-+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
-+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
-+	{1200, 1200},
-+	0,
-+	SENSORORDER_rgb,
-+	16,                 /* sensor distance                         */
-+	3,                  /* number of buttons                       */
-+	kCIS1240,           /* use default settings during calibration */
-+	0,                  /* not used here...                        */
-+	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
-+};
-+
- /******************* additional Hardware descriptions ************************/
- 
- /** U24, UT12 and UT16
-@@ -2279,6 +2297,75 @@
- 	2.0
- };
- 
-+/** Canon LiDE25 */
-+static HWDef Hw0x04A9_0x2220 =
-+{
-+	0.70,   /* dMaxMotorSpeed (Max_Speed)                     */
-+	0.25,   /* dMaxMoveSpeed (Max_Speed)                      */
-+	0.85,   /* dHighSpeed                                     */
-+	100,    /* wIntegrationTimeLowLamp                        */
-+	100,    /* wIntegrationTimeHighLamp                       */
-+	1200,   /* wMotorDpi (Full step DPI)                      */
-+	512,    /* wRAMSize (KB)                                  */
-+	3.75,   /* dMinIntegrationTimeLowres (ms)                 */
-+	5.75,   /* dMinIntegrationTimeHighres (ms)                */
-+	   0,   /* wGreenPWMDutyCycleLow (reg 0x2a + 0x2b)        */
-+	   0,   /* wGreenPWMDutyCycleHigh (reg 0x2a + 0x2b)       */
-+
-+	0x11,   /* bSensorConfiguration (0x0b)                    */
-+	0x4d,   /* sensor control settings (reg 0x0c)             */
-+	0x2f,   /* sensor control settings (reg 0x0d)             */
-+	0x00,   /* sensor control settings (reg 0x0e)             */
-+
-+	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
-+	       /* mono (reg 0x0f to 0x18)                        */
-+
-+	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
-+	      /* color (reg 0x0f to 0x18)                       */
-+
-+	(_BLUE_CH | _ONE_CH_COLOR), /* bReg_0x26 color mode       */
-+
-+	0x00,   /* bReg 0x27 color mode                           */
-+	2,      /* bReg 0x29 illumination mode                    */
-+
-+	{ 3,  0,    0, 50, 3700,  0,    0 },
-+	{ 2, 50, 5600, 50, 7100, 50, 4600 },
-+
-+	1,      /* StepperPhaseCorrection (reg 0x1a + 0x1b)       */
-+	0,      /* bOpticBlackStart (reg 0x1c)                    */
-+	0,      /* bOpticBlackEnd (reg 0x1d)                      */
-+	0x7f,   /* wActivePixelsStart (reg 0x1e + 0x1f)           */
-+	10559,  /* wLineEnd (reg 0x20 + 0x21)                     */
-+
-+	50,     /* red lamp on    (reg 0x2c + 0x2d)               */
-+	5600,   /* red lamp off   (reg 0x2e + 0x2f)               */
-+	50,     /* green lamp on  (reg 0x30 + 0x31)               */
-+	7100,   /* green lamp off (reg 0x32 + 0x33)               */
-+	50,     /* blue lamp on   (reg 0x34 + 0x35)               */
-+	4600,   /* blue lamp off  (reg 0x36 + 0x37)               */
-+
-+	3,      /* stepper motor control (reg 0x45)               */
-+	0,      /* wStepsAfterPaperSensor2 (reg 0x4c + 0x4d)      */
-+	0x20,   /* steps to reverse when buffer is full reg 0x50) */
-+	0xfc,   /* acceleration profile (reg 0x51)                */
-+	0,      /* lines to process (reg 0x54)                    */
-+	0x0f,   /* kickstart (reg 0x55)                           */
-+	0x08,   /* pwm freq (reg 0x56)                            */
-+	0x1f,   /* pwm duty cycle (reg 0x57)                      */
-+
-+	0x04,   /* Paper sense (reg 0x58)                         */
-+
-+	0x66,   /* misc io12 (reg 0x59)                           */
-+	0x16,   /* misc io34 (reg 0x5a)                           */
-+	0x91,   /* misc io56 (reg 0x5b)                           */
-+	0x01,   /* test mode ADC Output CODE MSB (reg 0x5c)       */
-+	0,      /* test mode ADC Output CODE LSB (reg 0x5d)       */
-+	0,      /* test mode (reg 0x5e)                           */
-+	_LM9833,
-+	MODEL_CANON_LIDE25,
-+	2.0
-+};
-+
- /******************** all available combinations *****************************/
- 
- /** here we have all supported devices and their settings...
-@@ -2348,6 +2435,7 @@
- 	{"0x04A9-0x2208",   &Cap0x04A9_0x2208, &Hw0x04A9_0x2208, "D660U"       },
- 	{"0x04A9-0x220D",   &Cap0x04A9_0x220D, &Hw0x04A9_0x220D, "N670U/N676U/LiDE20" },
- 	{"0x04A9-0x220E",   &Cap0x04A9_0x220E, &Hw0x04A9_0x220E, "N1240U/LiDE30"      },
-+	{"0x04A9-0x2220",   &Cap0x04A9_0x2220, &Hw0x04A9_0x2220, "LiDE25"      },
- 
- 	/* Please add other devices here...
- 	 * The first entry is a string, composed out of the vendor and product id,
-@@ -2546,7 +2634,23 @@
- 		/* Gray mode MCLK settings */
- 		{ 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0,  6.0,  6.0,  6.0 },
- 		{ 6.5, 6.5, 6.5, 7.0, 8.0, 8.0, 8.0, 10.0, 10.0, 10.0 }
--	}
-+	},
-+
-+	{ MODEL_CANON_LIDE25, 8, 51, 9,
-+		/* Motor settings (PWM and PWM_Duty) */
-+		/* <=75dpi       <=100dpi      <=150dpi      <=200dpi      <=300dpi  */
-+		{{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 },
-+
-+		/* <=400dpi     <=600dpi      <=800dpi      <=1200dpi     <=2400dpi */
-+		{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }},
-+		/* Color mode MCLK settings */
-+		{ 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0 },
-+		{ 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 5.0, 6.0, 6.0, 6.0 },
-+		/* Gray mode MCLK settings */
-+		{ 8.5, 7.0, 4.0, 4.0, 2.5, 2.5, 2.5,  2.5,  2.5,  2.5 },
-+		{ 6.5, 6.5, 6.0, 6.0, 6.0, 6.0, 8.0, 12.0, 12.0, 12.0 }
-+ 	}
-+
- };
- 
- /* END PLUSTEK-USBDEVS.C ....................................................*/
-diff -Nur sane-backends-1.0.16/backend/plustek-usb.h sane-backends-lide25v2/backend/plustek-usb.h
---- sane-backends-1.0.16/backend/plustek-usb.h	2005-07-04 18:59:54.000000000 +0200
-+++ sane-backends-lide25v2/backend/plustek-usb.h	2005-10-25 12:18:56.802627464 +0200
-@@ -278,6 +278,7 @@
- 	MODEL_CANON600 ,      /**< for CanoScan 600dpi models   */
- 	MODEL_CANON1200,      /**< for Canon 1200dpi models     */
- 	MODEL_CANONCCD1200,   /**< for Canon CCD 1200dpi models */
-+	MODEL_CANON_LIDE25,   /**< for CanoScan LiDE25          */
- 	MODEL_UMAX,           /**< for UMAX 3400/3450           */
- 	MODEL_UMAX1200,       /**< for UMAX 5400                */
- 	MODEL_LAST
diff --git a/media-gfx/sane-backends/files/lide25.patch b/media-gfx/sane-backends/files/lide25.patch
deleted file mode 100644
index 54d4aa2454d1..000000000000
--- a/media-gfx/sane-backends/files/lide25.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Nur sane-backends/backend/plustek-usb.c sane-backends-new/backend/plustek-usb.c
---- sane-backends/backend/plustek-usb.c	2005-07-04 11:54:30.000000000 +0200
-+++ sane-backends-new/backend/plustek-usb.c	2005-07-21 14:37:15.000000000 +0200
-@@ -1094,7 +1094,8 @@
- 	/* the CanoScan CIS devices need special handling... */
- 	if((dev->usbDev.vendor == 0x04A9) &&    
- 		(dev->usbDev.product==0x2206 || dev->usbDev.product==0x2207 ||
--		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E)) {
-+		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E ||
-+		 dev->usbDev.product==0x2220)) {
- 		use_alt_cal = SANE_TRUE;
- 		
- 	} else {
-diff -Nur sane-backends/backend/plustek-usbdevs.c sane-backends-new/backend/plustek-usbdevs.c
---- sane-backends/backend/plustek-usbdevs.c	2005-07-04 11:54:30.000000000 +0200
-+++ sane-backends-new/backend/plustek-usbdevs.c	2005-07-21 14:36:48.000000000 +0200
-@@ -702,6 +702,24 @@
- 	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
- };
- 
-+/* Canon LiDE25
-+ */
-+static DCapsDef Cap0x04A9_0x2220 =
-+{
-+	{{ 0, 100}, 50, 10, {2550, 3508}, {75, 75}, COLOR_BW },
-+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
-+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
-+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
-+	{1200, 1200},
-+	0,
-+	SENSORORDER_rgb,
-+	16,                 /* sensor distance                         */
-+	3,                  /* number of buttons                       */
-+	kCIS1240,           /* use default settings during calibration */
-+	0,                  /* not used here...                        */
-+	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
-+};
-+
- /******************* additional Hardware descriptions ************************/
- 
- /** U24, UT12 and UT16
-@@ -2279,6 +2297,75 @@
- 	2.0
- };
- 
-+/** Canon LiDE25 */
-+static HWDef Hw0x04A9_0x2220 =
-+{
-+	0.72,   /* dMaxMotorSpeed (Max_Speed)                     */
-+	0.30,   /* dMaxMoveSpeed (Max_Speed)                      */
-+	0.0,    /* dHighSpeed                                     */
-+	100,    /* wIntegrationTimeLowLamp                        */
-+	100,    /* wIntegrationTimeHighLamp                       */
-+	1200,   /* wMotorDpi (Full step DPI)                      */
-+	512,    /* wRAMSize (KB)                                  */
-+	3.75,   /* dMinIntegrationTimeLowres (ms)                 */
-+	5.75,   /* dMinIntegrationTimeHighres (ms)                */
-+	   0,   /* wGreenPWMDutyCycleLow (reg 0x2a + 0x2b)        */
-+	   0,   /* wGreenPWMDutyCycleHigh (reg 0x2a + 0x2b)       */
-+
-+	0x11,   /* bSensorConfiguration (0x0b)                    */
-+	0x4d,   /* sensor control settings (reg 0x0c)             */
-+	0x2f,   /* sensor control settings (reg 0x0d)             */
-+	0x00,   /* sensor control settings (reg 0x0e)             */
-+
-+	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
-+	       /* mono (reg 0x0f to 0x18)                        */
-+
-+	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
-+	      /* color (reg 0x0f to 0x18)                       */
-+
-+	(_BLUE_CH | _ONE_CH_COLOR), /* bReg_0x26 color mode       */
-+
-+	0x00,   /* bReg 0x27 color mode                           */
-+	2,      /* bReg 0x29 illumination mode                    */
-+
-+	{ 3,  0,    0,  50,  3000,  0,     0 },
-+	{ 2, 50, 16383, 50, 16383, 50, 16383 },
-+
-+	1,      /* StepperPhaseCorrection (reg 0x1a + 0x1b)       */
-+	0,      /* bOpticBlackStart (reg 0x1c)                    */
-+	0,      /* bOpticBlackEnd (reg 0x1d)                      */
-+	0x7f,   /* wActivePixelsStart (reg 0x1e + 0x1f)           */
-+	10559,  /* wLineEnd (reg 0x20 + 0x21)                     */
-+
-+	50,     /* red lamp on    (reg 0x2c + 0x2d)               */
-+	16383,  /* red lamp off   (reg 0x2e + 0x2f)               */
-+	50,     /* green lamp on  (reg 0x30 + 0x31)               */
-+	16383,  /* green lamp off (reg 0x32 + 0x33)               */
-+	50,     /* blue lamp on   (reg 0x34 + 0x35)               */
-+	16383,  /* blue lamp off  (reg 0x36 + 0x37)               */
-+
-+	3,      /* stepper motor control (reg 0x45)               */
-+	0,      /* wStepsAfterPaperSensor2 (reg 0x4c + 0x4d)      */
-+	0x20,   /* steps to reverse when buffer is full reg 0x50) */
-+	0xfc,   /* acceleration profile (reg 0x51)                */
-+	0,      /* lines to process (reg 0x54)                    */
-+	0x0f,   /* kickstart (reg 0x55)                           */
-+	0x08,   /* pwm freq (reg 0x56)                            */
-+	0x1f,   /* pwm duty cycle (reg 0x57)                      */
-+
-+	0x04,   /* Paper sense (reg 0x58)                         */
-+
-+	0x66,   /* misc io12 (reg 0x59)                           */
-+	0x16,   /* misc io34 (reg 0x5a)                           */
-+	0x91,   /* misc io56 (reg 0x5b)                           */
-+	0x01,   /* test mode ADC Output CODE MSB (reg 0x5c)       */
-+	0,      /* test mode ADC Output CODE LSB (reg 0x5d)       */
-+	0,      /* test mode (reg 0x5e)                           */
-+	_LM9833,
-+	MODEL_CANON1200,
-+	2.0
-+};
-+
- /******************** all available combinations *****************************/
- 
- /** here we have all supported devices and their settings...
-@@ -2348,6 +2435,7 @@
- 	{"0x04A9-0x2208",   &Cap0x04A9_0x2208, &Hw0x04A9_0x2208, "D660U"       },
- 	{"0x04A9-0x220D",   &Cap0x04A9_0x220D, &Hw0x04A9_0x220D, "N670U/N676U/LiDE20" },
- 	{"0x04A9-0x220E",   &Cap0x04A9_0x220E, &Hw0x04A9_0x220E, "N1240U/LiDE30"      },
-+	{"0x04A9-0x2220",   &Cap0x04A9_0x2220, &Hw0x04A9_0x2220, "LiDE25"      },
- 
- 	/* Please add other devices here...
- 	 * The first entry is a string, composed out of the vendor and product id,
diff --git a/media-gfx/sane-backends/files/sm3600usb.patch b/media-gfx/sane-backends/files/sm3600usb.patch
deleted file mode 100644
index 7dff9ca5f272..000000000000
--- a/media-gfx/sane-backends/files/sm3600usb.patch
+++ /dev/null
@@ -1,301 +0,0 @@
---- backend/sm3600.c	3 Jul 2005 13:35:48 -0000	1.13
-+++ backend/sm3600.c	16 Aug 2005 19:50:34 -0000	1.14
-@@ -55,24 +55,25 @@
- 
- ====================================================================== */
- 
--#include "sane/config.h"
-+#include "../include/sane/config.h"
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
- 
--#include <usb.h>
--
--#define BUILD	5
-+#define BUILD	6
- 
- #ifndef BACKEND_NAME
- #define BACKEND_NAME sm3600
- #endif
- 
--#include "sane/sane.h"
--#include "sane/sanei.h"
--#include "sane/sanei_backend.h"
--#include "sane/sanei_config.h"
--#include "sane/saneopts.h"
-+#include "../include/sane/sane.h"
-+#include "../include/sane/sanei.h"
-+#include "../include/sane/sanei_backend.h"
-+#include "../include/sane/sanei_config.h"
-+#include "../include/sane/saneopts.h"
-+#include "../include/sane/sanei_usb.h"
-+
-+#undef HAVE_LIBUSB
- 
- /* prevent inclusion of scantool.h */
- #define SCANTOOL_H
-@@ -326,7 +327,8 @@
- }
- 
- static SANE_Status
--RegisterSaneDev (struct usb_device *pdevUSB, TModel model, char *szName){
-+RegisterSaneDev (TModel model, SANE_String_Const szName)
-+{
-   TDevice * q;
- 
-   errno = 0;
-@@ -342,7 +344,6 @@
-   q->sane.model  = "ScanMaker 3600";
-   q->sane.type   = "flatbed scanner";
- 
--  q->pdev=pdevUSB;
-   q->model=model;
- 
-   ++num_devices;
-@@ -351,13 +352,37 @@
- 
-   return SANE_STATUS_GOOD;
- }
-+ 
-+static SANE_Status 
-+sm_usb_attach (SANE_String_Const dev_name)
-+{
-+  int fd;
-+  SANE_Status err;
-+  SANE_Word v, p;
-+  TModel model;
-+
-+  err = sanei_usb_open(dev_name, &fd);
-+  if (err)
-+    return err;
-+  err = sanei_usb_get_vendor_product (fd, &v, &p);
-+  if (err)
-+    {
-+      sanei_usb_close (fd);
-+      return err;
-+    }
-+  DBG (DEBUG_JUNK, "found dev %04X/%04X, %s\n", v, p, dev_name);
-+  model = GetScannerModel (v, p);
-+  if (model != unknown)
-+    RegisterSaneDev (model, dev_name);
-+
-+  sanei_usb_close(fd);
-+  return SANE_STATUS_GOOD;
-+}
- 
- SANE_Status
- sane_init (SANE_Int *version_code, SANE_Auth_Callback authCB)
- {
--  struct usb_bus    *pbus;
--  struct usb_device *pdev;
--  int                iBus;
-+  int                i;
- 
-   DBG_INIT();
- 
-@@ -372,38 +397,11 @@
-    }
- 
-   pdevFirst=NULL;
--
--  usb_init();
--  usb_find_busses();
--  if (!usb_busses)
--    return SANE_STATUS_IO_ERROR;
--
--  usb_find_devices();
--
--  iBus=0;
--  DBG(DEBUG_INFO,"starting bus scan\n");
--  for (pbus = usb_busses; pbus; pbus = pbus->next)
--    {
--      int iDev=0;
--      iBus++;
--      /* 0.1.3b no longer has a "busnum" member */
--      DBG(DEBUG_JUNK,"scanning bus %s\n", pbus->dirname);
--      for (pdev=pbus->devices; pdev; pdev  = pdev->next)
--	{
--	  TModel model;
--	  iDev++;
--	  DBG(DEBUG_JUNK,"found dev %04X/%04X\n",
--		  pdev->descriptor.idVendor,
--		  pdev->descriptor.idProduct);
--	  model=GetScannerModel(pdev->descriptor.idVendor,
--				       pdev->descriptor.idProduct);
--	  if (model!=unknown)
--	    {
--	      char ach[100];
--	      sprintf(ach,"%d/%d",iBus,iDev);
--	      RegisterSaneDev(pdev,model,ach);
--	    }
--	}
-+  
-+  sanei_usb_init();
-+  for (i = 0; aScanners[i].idProduct; i++) 
-+    {
-+      sanei_usb_find_devices(SCANNER_VENDOR, aScanners[i].idProduct, sm_usb_attach);
-     }
-   return SANE_STATUS_GOOD;
- }
-@@ -464,8 +462,11 @@
-   if (devicename[0]) /* selected */
-     {
-       for (pdev=pdevFirst; pdev; pdev=pdev->pNext)
-+{
-+DBG(DEBUG_VERBOSE,"%s<>%s\n",devicename, pdev->sane.name);
- 	if (!strcmp(devicename,pdev->sane.name))
- 	  break;
-+}
-       /* no dynamic post-registration */
-     }
-   else
-@@ -482,14 +483,11 @@
-   pinstFirst=this;
-   this->model=pdev->model; /* memorize model */
-   /* open and prepare USB scanner handle */
--  this->hScanner=usb_open(pdev->pdev);
--  if (!this->hScanner)
--    return SetError(this,SANE_STATUS_IO_ERROR, "cannot open scanner device");
--  rc=SANE_STATUS_GOOD;
--  if (usb_claim_interface(this->hScanner, 0))
--    return SetError(this,SANE_STATUS_IO_ERROR, "cannot claim IF");
--  if (usb_set_configuration(this->hScanner, 1))
--    return SetError(this,SANE_STATUS_IO_ERROR, "cannot set USB config 1");
-+
-+  if (sanei_usb_open (devicename, &this->hScanner) != SANE_STATUS_GOOD)
-+    return SetError (this, SANE_STATUS_IO_ERROR, "cannot open scanner device");
-+
-+  rc = SANE_STATUS_GOOD;
- 
-   this->quality=fast;
-   return InitOptions(this);
-@@ -505,8 +503,9 @@
-     {
-       if (this->state.bScanning)
- 	EndScan(this);
--      usb_close(this->hScanner);
--      this->hScanner=NULL;
-+
-+      sanei_usb_close(this->hScanner);
-+      this->hScanner=-1;
-     }
-   ResetCalibration(this); /* release calibration data */
-   /* unlink active device entry */
---- backend/sm3600.h	30 Apr 2004 21:02:04 -0000	1.10
-+++ backend/sm3600.h	16 Aug 2005 19:50:34 -0000	1.11
-@@ -190,7 +190,7 @@
-   TQuality           quality;
-   TMode              mode;
-   TModel             model;
--  usb_dev_handle    *hScanner;
-+  int                hScanner;
-   FILE              *fhLog;
-   FILE              *fhScan;
-   int                ichPageBuffer; /* write position in full page buffer */
---- backend/sm3600-scanusb.c	15 Apr 2004 21:06:58 -0000	1.11
-+++ backend/sm3600-scanusb.c	16 Aug 2005 19:50:34 -0000	1.12
-@@ -43,7 +43,7 @@
- 
- Userspace scan tool for the Microtek 3600 scanner
- 
--$Id: sm3600-scanusb.c,v 1.11 2004/04/15 21:06:58 eichholz-guest Exp $
-+$Id: sm3600-scanusb.c,v 1.12 2005/08/16 19:50:34 hmg-guest Exp $
- 
- (C) Marian Eichholz 2001
- 
-@@ -68,14 +68,20 @@
- 		       int  cchBuffer,
- 		       int  cJiffiesTimeout)
- {
--  return usb_control_msg(this->hScanner,
-+  SANE_Status err;
-+
-+  cJiffiesTimeout = cJiffiesTimeout;
-+
-+  err = sanei_usb_control_msg (this->hScanner,
- 			 nReqType,
- 			 nRequest,
- 			 nValue,
- 			 nIndex,
--			 pBuffer,
- 			 cchBuffer,
--			 cJiffiesTimeout);
-+			 pBuffer);
-+  if (err)
-+    return err;
-+  return cchBuffer;
- }
- 
- /* **********************************************************************
-@@ -90,11 +96,18 @@
- 	     int cchMax,
- 	     int cJiffiesTimeout)
- {
--  return usb_bulk_read(this->hScanner,
--		       nEndPoint,
--		       pBuffer,
--		       cchMax,
--		       cJiffiesTimeout);
-+  int err;
-+  size_t sz = cchMax;
-+
-+  nEndPoint = nEndPoint;
-+  cJiffiesTimeout = cJiffiesTimeout;
-+
-+  err = sanei_usb_read_bulk(this->hScanner,
-+			    pBuffer,
-+			    &sz);
-+  if (err)
-+    return err;
-+  return sz;
- }
- 
- /* **********************************************************************
-@@ -310,7 +323,9 @@
- 	{
- 	  rc=SetError(this,SANE_STATUS_IO_ERROR,
- 		      "bulk read of %d bytes failed: %s",
--		      cchChunk,usb_strerror());
-+		      cchChunk,
-+		      "I/O error"
-+		      );
- 	  continue;
- 	}
-     }
-@@ -371,7 +386,9 @@
-       else
- 	rc=SetError(this,SANE_STATUS_IO_ERROR,
- 		    "bulk read of %d bytes failed: %s",
--		    cchChunk,usb_strerror());
-+		    cchChunk,
-+		    "I/O error"
-+		    );
-     }
-   dprintf(DEBUG_COMM,"writing %d bytes\n",cchRead);
-   
---- backend/sm3600-scanutil.c	15 Apr 2004 21:06:58 -0000	1.11
-+++ backend/sm3600-scanutil.c	16 Aug 2005 19:50:34 -0000	1.12
-@@ -43,10 +43,11 @@
- 
- Userspace scan tool for the Microtek 3600 scanner
- 
--$Id: sm3600-scanutil.c,v 1.11 2004/04/15 21:06:58 eichholz-guest Exp $
-+$Id: sm3600-scanutil.c,v 1.12 2005/08/16 19:50:34 hmg-guest Exp $
- 
- ====================================================================== */
- 
-+#include <unistd.h>
- #include "sm3600-scantool.h"
- 
- /* **********************************************************************
---- backend/Makefile.in	13 Aug 2005 15:30:01 -0000	1.117
-+++ backend/Makefile.in	16 Aug 2005 19:50:33 -0000	1.118
-@@ -430,6 +430,7 @@
- libsane-sharp.la: ../sanei/sanei_constrain_value.lo
- libsane-sharp.la: ../sanei/sanei_scsi.lo
- libsane-sm3600.la: ../sanei/sanei_constrain_value.lo
-+libsane-sm3600.la: ../sanei/sanei_usb.lo
- libsane-sm3840.la: ../sanei/sanei_config2.lo
- libsane-sm3840.la: ../sanei/sanei_constrain_value.lo
- libsane-sm3840.la: ../sanei/sanei_usb.lo
diff --git a/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild
deleted file mode 100644
index 7440125f146f..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.13-r3.ebuild,v 1.7 2005/01/10 09:47:04 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( sys-libs/libieee1284 )
-	=sys-apps/sed-4*
-	usb? ( dev-libs/libusb )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch"
-
-SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64"
-
-
-src_unpack() {
-	unpack ${A}
-	use usb && unpack ${BROTHERMFCDRIVER}.bz2
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	cd ${S}
-
-	#only generate the .ps and not the fonts
-	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
-		doc/Makefile.in
-	#compile errors when using NDEBUG otherwise
-	sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c
-	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || die
-	make || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		install || die
-
-	docinto backend
-	cd backend
-	dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO
-
-	echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane
-	insinto /etc/env.d
-	doins 30sane
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild
deleted file mode 100644
index ab7363d1074e..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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-r4.ebuild,v 1.2 2005/11/03 19:25:16 phosphan Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="usb gphoto2 ipv6 v4l"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-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
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#   abaton agfafocus apple artec as6e avision bh canon canon630u coolscan
-#   coolscan2 dc25 dmc epson fujitsu genesys gt68xx hp leo matsushita microtek
-#   microtek2 mustek mustek_usb nec pie plustek plustek_pp ricoh s9036
-#   sceptre sharp sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp
-#   umax1220u artec_eplus48u ma1509 ibm hp5400 u12 sm3840 snapscan niash dc210 dc240
-#   pint net
-#
-# Note that some backends has specific dependencies which make the compilation
-# fail because not supported on your current platform.
-pkg_setup() {
-	enewgroup scanner
-
-	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
-
-	if [[ "${SANE_BACKENDS}" != "" ]]; then
-		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
-		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
-		use usb && SANE_BACKENDS="${SANE_BACKENDS} sm3600"
-	fi
-
-	if ! use x86 && ! use amd64; then
-		tmp="${SANE_BACKENDS}"
-		for backend in ${IEEE1284_BACKENDS}; do
-			if [[ "${tmp/$backend/}" != "${SANE_BACKENDS}" ]]; then
-				ewarn "You selected a backend which is disabled because it's not usable in your arch."
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [ -z "${SANE_BACKENDS}" ]; then
-		einfo "You can use the variable SANE_BACKENDS to pick backends"
-		einfo "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	cd ${S}
-
-	#only generate the .ps and not the fonts
-	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
-		doc/Makefile.in
-	#compile errors when using NDEBUG otherwise
-	sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c \
-		|| die "function_name fix failed"
-
-	if use usb; then
-		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-		sed -e 's/bh canon/bh brother canon/' -i configure || \
-			die "could not add 'brother' to backend list"
-		epatch ${FILESDIR}/libusbscanner-device-r1.patch
-		:
-	fi
-	epatch ${FILESDIR}/lide25-r1.patch
-	epatch ${FILESDIR}/kernel2.6.13usb-problem.patch
-	epatch ${FILESDIR}/sm3600usb.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() {
-	if use amd64; then
-		filter-flags -fstack-protector
-	fi
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${SANE_BACKENDS}" \
-	econf \
-		$(use_enable usb libusb) \
-		$(use_with gphoto2) \
-		$(use_enable ipv6) \
-		${myconf} || die "econf failed"
-
-	emake || die
-
-	if use usb; then
-		cd tools/hotplug
-		grep -v '^$' libsane.usermap > libsane.usermap.new
-		mv libsane.usermap.new libsane.usermap
-	fi
-}
-
-src_install () {
-	einstall docdir=${D}/usr/share/doc/${PF}
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	if use usb; then
-		cd tools/hotplug
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins libsane.usermap
-		doexe libusbscanner
-		newdoc README README.hotplug
-		cd ../..
-	fi
-
-	docinto backend
-	cd backend
-	dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO
-
-	echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane
-	insinto /etc/env.d
-	doins 30sane
-
-}