summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2008-05-13 11:27:38 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2008-05-13 11:27:38 +0000
commit473145a9a2b36da2c73635300087fd4c4e464fb2 (patch)
tree114d3c3a107518dd8ea5cfb04c1e56cae3ca9685 /media-gfx/sane-backends/files
parentadd clisp hyperspec flag (diff)
downloadgentoo-2-473145a9a2b36da2c73635300087fd4c4e464fb2.tar.gz
gentoo-2-473145a9a2b36da2c73635300087fd4c4e464fb2.tar.bz2
gentoo-2-473145a9a2b36da2c73635300087fd4c4e464fb2.zip
Removing obsolete versions + cleaner solution for TeX-font-problems.
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-gfx/sane-backends/files')
-rw-r--r--media-gfx/sane-backends/files/udev-rule-2.patch52
-rw-r--r--media-gfx/sane-backends/files/udev-rule-3.patch52
-rw-r--r--media-gfx/sane-backends/files/udev-rule.patch44
3 files changed, 0 insertions, 148 deletions
diff --git a/media-gfx/sane-backends/files/udev-rule-2.patch b/media-gfx/sane-backends/files/udev-rule-2.patch
deleted file mode 100644
index 372ce465a71c..000000000000
--- a/media-gfx/sane-backends/files/udev-rule-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: tools/sane-desc.c
-===================================================================
---- tools/sane-desc.c.orig
-+++ tools/sane-desc.c
-@@ -3151,7 +3151,7 @@ print_udev_header (void)
-
- printf
- ("#\n"
-- "# udev rules file for supported USB devices\n"
-+ "# udev rules file for supported USB and SCSI devices\n"
- "#\n"
- "# To add a USB device, add a rule to the list below between the SUBSYSTEM...\n"
- "# and LABEL... lines.\n"
-@@ -3169,25 +3169,32 @@ print_udev_header (void)
- static void
- print_udev (void)
- {
-+ int commentlen;
- usbid_type *usbid = create_usbids_table ();
-
- print_udev_header ();
- printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
-- printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
-+ puts("SUBSYSTEMS==\"scsi\", ATTRS{type}==\"6\", MODE=\"660\", GROUP=\"scanner\"");
-+ printf ("SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libsane_rules_end\"\n\n");
- while (usbid)
- {
- manufacturer_model_type * name = usbid->name;
-
-- printf ("# ");
-+ commentlen = printf ("# ");
- while (name)
- {
-- if (name != usbid->name)
-- printf (" | ");
-- printf ("%s", name->name);
-+ if (name != usbid->name) {
-+ commentlen += printf (" | ");
-+ }
-+ if(commentlen + strlen(name->name) > 480) {
-+ printf(" (line too long, names omitted)");
-+ break;
-+ }
-+ commentlen += printf ("%s", name->name);
- name = name->next;
- }
- printf ("\n");
-- printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
-+ printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
- usbid = usbid->next;
- }
diff --git a/media-gfx/sane-backends/files/udev-rule-3.patch b/media-gfx/sane-backends/files/udev-rule-3.patch
deleted file mode 100644
index 2daf62098ffd..000000000000
--- a/media-gfx/sane-backends/files/udev-rule-3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: tools/sane-desc.c
-===================================================================
---- tools/sane-desc.c.orig
-+++ tools/sane-desc.c
-@@ -3151,7 +3151,7 @@ print_udev_header (void)
-
- printf
- ("#\n"
-- "# udev rules file for supported USB devices\n"
-+ "# udev rules file for supported USB and SCSI devices\n"
- "#\n"
- "# To add a USB device, add a rule to the list below between the SUBSYSTEM...\n"
- "# and LABEL... lines.\n"
-@@ -3169,25 +3169,32 @@ print_udev_header (void)
- static void
- print_udev (void)
- {
-+ int commentlen;
- usbid_type *usbid = create_usbids_table ();
-
- print_udev_header ();
- printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
-- printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
-+ puts("SUBSYSTEMS==\"scsi\", ATTRS{type}==\"6\", MODE=\"660\", GROUP=\"scanner\"");
-+ printf ("SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libsane_rules_end\"\n\n");
- while (usbid)
- {
- manufacturer_model_type * name = usbid->name;
-
-- printf ("# ");
-+ commentlen = printf ("# ");
- while (name)
- {
-- if (name != usbid->name)
-- printf (" | ");
-- printf ("%s", name->name);
-+ if (name != usbid->name) {
-+ commentlen += printf (" | ");
-+ }
-+ if(commentlen + strlen(name->name) > 480) {
-+ printf(" (line too long, names omitted)");
-+ break;
-+ }
-+ commentlen += printf ("%s", name->name);
- name = name->next;
- }
- printf ("\n");
-- printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
-+ printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
- usbid = usbid->next;
- }
diff --git a/media-gfx/sane-backends/files/udev-rule.patch b/media-gfx/sane-backends/files/udev-rule.patch
deleted file mode 100644
index 894f47e6677f..000000000000
--- a/media-gfx/sane-backends/files/udev-rule.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- tools/sane-desc.c 2006-07-31 08:57:40.000000000 +0200
-+++ tools/sane-desc-new.c 2006-07-31 09:10:50.000000000 +0200
-@@ -3151,7 +3151,7 @@
-
- printf
- ("#\n"
-- "# udev rules file for supported USB devices\n"
-+ "# udev rules file for supported USB and SCSI devices\n"
- "#\n"
- "# To add a USB device, add a rule to the list below between the SUBSYSTEM...\n"
- "# and LABEL... lines.\n"
-@@ -3169,21 +3169,28 @@
- static void
- print_udev (void)
- {
-+ int commentlen;
- usbid_type *usbid = create_usbids_table ();
-
- print_udev_header ();
- printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
-+ puts("BUS==\"scsi\", SYSFS{type}==\"6\", MODE=\"660\", GROUP=\"scanner\"");
- printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
- while (usbid)
- {
- manufacturer_model_type * name = usbid->name;
-
-- printf ("# ");
-+ commentlen = printf ("# ");
- while (name)
- {
-- if (name != usbid->name)
-- printf (" | ");
-- printf ("%s", name->name);
-+ if (name != usbid->name) {
-+ commentlen += printf (" | ");
-+ }
-+ if(commentlen + strlen(name->name) > 480) {
-+ printf(" (line too long, names omitted)");
-+ break;
-+ }
-+ commentlen += printf ("%s", name->name);
- name = name->next;
- }
- printf ("\n");