sane-backends: => 1.0.21

4 files changed, 7 insertions, 27 deletions

diff --git a/graphics-libs/sane-backends/DETAILS b/graphics-libs/sane-backends/DETAILS
index d51e77af75..d92e5b0a6e 100755
--- a/graphics-libs/sane-backends/DETAILS
+++ b/graphics-libs/sane-backends/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sane-backends
-         VERSION=1.0.20
-     SOURCE_HASH=sha512:0edaea74753912f8466d9ef00228d306ec9b4d754ca48717f7fd4b61f99bee7a7c9c2a1abfb461f07859bc780f67fe2c969615359c2e388bc6c8ad3e4b339859
-      PATCHLEVEL=1
+         VERSION=1.0.21
+     SOURCE_HASH=sha512:52b5a22b2af67062eb74afc2383eb72c79deb1ff4341c93d9d5777664d5e622c808b3f68b5c6e0b2db47900221b4111ad3e454d34079f0ad1c0492cbd43eead7
+#      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.sane-project.org/pub/sane/$SPELL-$VERSION/$SOURCE
diff --git a/graphics-libs/sane-backends/HISTORY b/graphics-libs/sane-backends/HISTORY
index 5abc3bc5e8..1c948c89f8 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,7 @@
+2010-04-30 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 1.0.21
+	* PRE_BUILD, udev.diff: deleted
+
 2009-11-15 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD, udev.diff: added
diff --git a/graphics-libs/sane-backends/PRE_BUILD b/graphics-libs/sane-backends/PRE_BUILD
deleted file mode 100755
index 23b402aa0e..0000000000
--- a/graphics-libs/sane-backends/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch  -p1 < $SPELL_DIRECTORY/udev.diff
diff --git a/graphics-libs/sane-backends/udev.diff b/graphics-libs/sane-backends/udev.diff
deleted file mode 100644
index 6ad57a01b2..0000000000
--- a/graphics-libs/sane-backends/udev.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr sane-backends-1.0.20/tools/sane-desc.c sane-backends-1.0.20.cp/tools/sane-desc.c
---- sane-backends-1.0.20/tools/sane-desc.c	2009-04-15 03:47:56.000000000 +0200
-+++ sane-backends-1.0.20.cp/tools/sane-desc.c	2009-11-15 21:13:35.000000000 +0100
-@@ -3488,7 +3488,7 @@
-   printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
-   printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
-   printf ("# Generic: SCSI device type 6 indicates a scanner\n");
--  printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
-+  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
-   printf ("# Some scanners advertise themselves as SCSI device type 3\n");
- 
-   while (scsiid)
-@@ -3521,7 +3521,7 @@
- 	    }
-         }
-       printf ("\n");
--      printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
-+      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
- 	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
-       scsiid = scsiid->next;
-     }