diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2007-08-18 14:56:36 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-08-18 14:56:36 +0000 |
commit | d09e37b5f419c45bde42d66021036f0dec1762f2 (patch) | |
tree | 5355ab1f48e4d4e5c52540b79a254a94279d269b /media-gfx/sane-backends | |
parent | Stable on ppc wrt bug 189347 (diff) | |
download | historical-d09e37b5f419c45bde42d66021036f0dec1762f2.tar.gz historical-d09e37b5f419c45bde42d66021036f0dec1762f2.tar.bz2 historical-d09e37b5f419c45bde42d66021036f0dec1762f2.zip |
Updated udev rules, to work with newer kernels, Bug #188573. This requires new udev-syntax, so block versions before udev-114.
Package-Manager: portage-2.1.3.6
Diffstat (limited to 'media-gfx/sane-backends')
-rw-r--r-- | media-gfx/sane-backends/ChangeLog | 9 | ||||
-rw-r--r-- | media-gfx/sane-backends/Manifest | 29 | ||||
-rw-r--r-- | media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r3 | 6 | ||||
-rw-r--r-- | media-gfx/sane-backends/files/udev-rule-2.patch | 52 | ||||
-rw-r--r-- | media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild | 143 |
5 files changed, 234 insertions, 5 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 0e57ec068c17..ca4c18ff3d79 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/sane-backends # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.116 2007/04/30 22:41:46 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.117 2007/08/18 14:56:36 zzam Exp $ + +*sane-backends-1.0.18-r3 (18 Aug 2007) + + 18 Aug 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/udev-rule-2.patch, +sane-backends-1.0.18-r3.ebuild: + Updated udev rules, to work with newer kernels, Bug #188573. This requires + new udev-syntax, so block versions before udev-114. 30 Apr 2007; Marius Mauch <genone@gentoo.org> sane-backends-1.0.17.ebuild, sane-backends-1.0.18-r2.ebuild: diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 0bd7928f310b..53d559405be7 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -1,7 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + 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 udev-rule-2.patch 1765 RMD160 4b228ec772c3089b73d99068f6f97e71cad75e76 SHA1 15766ab0b3e327e8d6e953579bab52d29338dc7c SHA256 1d2f8c6eef9b6aa3860570443d18d7221eab306a16afa38ec1b2eccf4ff5203a +MD5 d6ccee15994a2b435c5aa1e5bd6a86f4 files/udev-rule-2.patch 1765 +RMD160 4b228ec772c3089b73d99068f6f97e71cad75e76 files/udev-rule-2.patch 1765 +SHA256 1d2f8c6eef9b6aa3860570443d18d7221eab306a16afa38ec1b2eccf4ff5203a files/udev-rule-2.patch 1765 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 @@ -18,10 +25,14 @@ EBUILD sane-backends-1.0.18-r2.ebuild 4075 RMD160 dc3776fd4f348e0b1cb4cd0371bae2 MD5 d1c66e8eb000aff5a0a98f274993988a sane-backends-1.0.18-r2.ebuild 4075 RMD160 dc3776fd4f348e0b1cb4cd0371bae22af8c46460 sane-backends-1.0.18-r2.ebuild 4075 SHA256 a4f8a4df1f3c1111bf9db7fd9c84c9a6fcb1491618da1f23e13ea51e35dc1291 sane-backends-1.0.18-r2.ebuild 4075 -MISC ChangeLog 19679 RMD160 8c36fa7f33262af774df321a046ba47046fb134a SHA1 14a1ebfc7272ef1949c43e88239796b13ac088a7 SHA256 883c0549a30697c94d2ed3313050f416c347aed18956eabdad202d9ba2f9027c -MD5 2c24d29aae8ffdd3928812358bc4024f ChangeLog 19679 -RMD160 8c36fa7f33262af774df321a046ba47046fb134a ChangeLog 19679 -SHA256 883c0549a30697c94d2ed3313050f416c347aed18956eabdad202d9ba2f9027c ChangeLog 19679 +EBUILD sane-backends-1.0.18-r3.ebuild 4184 RMD160 ee30c073551c3d20449c436b78899be86103ea8c SHA1 41f3998662cf3c60577a7569c63327465ae61f9a SHA256 3bad8ca5609d99fad9c2f7e895a6191b1f5015b9e57b03f645147c56895f9111 +MD5 f660802972fcaa22b54cf069ecb3cf5d sane-backends-1.0.18-r3.ebuild 4184 +RMD160 ee30c073551c3d20449c436b78899be86103ea8c sane-backends-1.0.18-r3.ebuild 4184 +SHA256 3bad8ca5609d99fad9c2f7e895a6191b1f5015b9e57b03f645147c56895f9111 sane-backends-1.0.18-r3.ebuild 4184 +MISC ChangeLog 19963 RMD160 f8557a1598ce6fad122d79df3d234b88267322fe SHA1 3dacfd03f81475e98d321639e7d38ecdcd72c76e SHA256 3c159bd3bc7170e37968498283751b57fc005185cd08e775e6fe4898970329e0 +MD5 4c88eb8292d59eecefe39a62f05865e6 ChangeLog 19963 +RMD160 f8557a1598ce6fad122d79df3d234b88267322fe ChangeLog 19963 +SHA256 3c159bd3bc7170e37968498283751b57fc005185cd08e775e6fe4898970329e0 ChangeLog 19963 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 metadata.xml 224 @@ -32,3 +43,13 @@ SHA256 2e34b33618661e8e23c7cee3d878bf759aa155250aec9f14d3c4ee1dd1eaac48 files/di 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 +MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18-r3 545 +RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18-r3 545 +SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18-r3 545 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.6 (GNU/Linux) + +iD8DBQFGxwivt2vP6XvVdOcRAqaQAJ918597E649nHZYFktwTCfTAw7dCQCgjoAP +PB59kkwfij64yPMhISz7OUQ= +=HMuc +-----END PGP SIGNATURE----- diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r3 new file mode 100644 index 000000000000..5242a0c5bacf --- /dev/null +++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r3 @@ -0,0 +1,6 @@ +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/udev-rule-2.patch b/media-gfx/sane-backends/files/udev-rule-2.patch new file mode 100644 index 000000000000..372ce465a71c --- /dev/null +++ b/media-gfx/sane-backends/files/udev-rule-2.patch @@ -0,0 +1,52 @@ +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/sane-backends-1.0.18-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild new file mode 100644 index 000000000000..be94752db621 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild @@ -0,0 +1,143 @@ +# 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-r3.ebuild,v 1.1 2007/08/18 14:56:36 zzam 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" + +# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) +RDEPEND="${RDEPEND} + !<sys-fs/udev-114" + +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 + elog "You can use the variable SANE_BACKENDS to pick backends" + elog "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}/udev-rule-2.patch + epatch ${FILESDIR}/broken_coolscan.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 +} |