Fix for overlong comments in the udev rules added, bug #142052

Package-Manager: portage-2.1

4 files changed, 15 insertions, 178 deletions

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index a0a001af2b70..64c16b1d14ba 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -18,10 +18,10 @@ 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 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
+AUX udev-rule.patch 1307 RMD160 52db3085e925d2ae47caf15424be35d9c9561fa4 SHA1 887ce0e30d771b11e547ffd5f92be49e8908936c SHA256 8c1419b49933d85a53397e95ac268e11ea864f76a242cc02c604625bfdc5ff54
+MD5 8d2c305dee317a0b715918c211de9719 files/udev-rule.patch 1307
+RMD160 52db3085e925d2ae47caf15424be35d9c9561fa4 files/udev-rule.patch 1307
+SHA256 8c1419b49933d85a53397e95ac268e11ea864f76a242cc02c604625bfdc5ff54 files/udev-rule.patch 1307
 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
@@ -41,18 +41,18 @@ EBUILD sane-backends-1.0.17.ebuild 3862 RMD160 2393b323221b013862b58221e70d08393
 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-r2.ebuild 4049 RMD160 d342a22cfe38fbc496da13f11879651316b3a80e SHA1 0a3c3d25d8d4f627b3ac897be9b701f72a39115f SHA256 543b0e7a4ad4343302f9a43474bb7f06dc11204c8fd8f915945079a67d4ce14f
+MD5 9357f5e686c3576a6332ce556f11cff3 sane-backends-1.0.18-r2.ebuild 4049
+RMD160 d342a22cfe38fbc496da13f11879651316b3a80e sane-backends-1.0.18-r2.ebuild 4049
+SHA256 543b0e7a4ad4343302f9a43474bb7f06dc11204c8fd8f915945079a67d4ce14f sane-backends-1.0.18-r2.ebuild 4049
 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 ChangeLog 17687 RMD160 c6a1e34445a21998582a5ecdaef766c1c6a68273 SHA1 a7a9971bd174e13204d776f1d31c000c22510159 SHA256 1b90e909dd9c0e6f1fbe0a5238467cb7d3b505095261cd802e8b4595c91b4edd
+MD5 e1cc459d36b715ad42db181a0a65439e ChangeLog 17687
+RMD160 c6a1e34445a21998582a5ecdaef766c1c6a68273 ChangeLog 17687
+SHA256 1b90e909dd9c0e6f1fbe0a5238467cb7d3b505095261cd802e8b4595c91b4edd ChangeLog 17687
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 RMD160 d646bef174a902fd1910871e794292c44f292052 metadata.xml 224
@@ -69,6 +69,6 @@ SHA256 2e34b33618661e8e23c7cee3d878bf759aa155250aec9f14d3c4ee1dd1eaac48 files/di
 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
-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
+MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18-r2 545
+RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18-r2 545
+SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18-r2 545
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r1 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r1
deleted file mode 100644
index 5242a0c5bacf..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 69b18ea038b8cd0e289c04c512b43b8e sane-1.0.18-brother-driver.diff.bz2 8335
-RMD160 8d86dccca4054699e367412c25d80d8641de42ca sane-1.0.18-brother-driver.diff.bz2 8335
-SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b sane-1.0.18-brother-driver.diff.bz2 8335
-MD5 7ca7e2908e24721471de92cf40c75e60 sane-backends-1.0.18.tar.gz 3789493
-RMD160 aa863adff417d7c33cbb85c193878aa54a056100 sane-backends-1.0.18.tar.gz 3789493
-SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3 sane-backends-1.0.18.tar.gz 3789493
diff --git a/media-gfx/sane-backends/files/scsi-udev-rule.patch b/media-gfx/sane-backends/files/scsi-udev-rule.patch
deleted file mode 100644
index d42f5faa8286..000000000000
--- a/media-gfx/sane-backends/files/scsi-udev-rule.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tools/sane-desc.c	2006-07-28 10:46:32.000000000 +0200
-+++ tools/sane-desc.c.new	2006-07-28 10:46:21.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"
-@@ -3173,6 +3173,7 @@
- 
-   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)
-     {
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r1.ebuild
deleted file mode 100644
index 1f9de382fc1b..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/07/28 09:12:14 phosphan Exp $
-
-inherit eutils
-
-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-0.1.8 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-BROTHERMFCPATCHVER="1.0.18"
-BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
-
-# Could not access via ftp on 2006-07-20
-SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
-	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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-# 
-# abaton agfafocus apple artec as6e avision bh brother canon 
-# canon630u coolscan coolscan2 dc25 dmc 
-# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek 
-# microtek2 mustek mustek_usb nec pie pixma plustek 
-# plustek_pp ricoh s9036 sceptre sharp 
-# sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u 
-# artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840 hp4200 
-# sm3600 hp3500 stv680"
-
-# 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
-
-	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"
-	fi
-	epatch ${FILESDIR}/scsi-udev-rule.patch
-}
-
-src_compile() {
-	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 () {
-	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF}
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-	if use usb; then
-		cd tools/hotplug
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins libsane.usermap
-		doexe libusbscanner
-		newdoc README README.hotplug
-		echo >> ${D}/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
-		cd ../..
-	fi
-	cd tools/udev
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
-	newins libsane.rules 99-libsane.rules
-	cd ../..
-
-	dodoc NEWS AUTHORS LICENSE ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> ${D}/etc/env.d/30sane
-}