1. Diego Elio Pettenò
  2. flame-overlay

Commits

Diego Elio Pettenò  committed 6e138f5

Remove patched sane-backends now that in tree is available.

  • Participants
  • Parent commits 3f6ebe5
  • Branches master

Comments (0)

Files changed (4)

File media-gfx/sane-backends/Manifest

-AUX sane-backends-1.0.17-doc.patch 1247 RMD160 38c5dd031f2d0fbccf9c1f6e8af0f025cd2c153e SHA1 e5874aa76cccb111322be6fabd868671b76c8b9e SHA256 c6b97584ddc3dc3030c7086d9cf7367a0817d28d16c603213ddaf3fae4b4f796
-AUX udev-rule.patch 1307 RMD160 52db3085e925d2ae47caf15424be35d9c9561fa4 SHA1 887ce0e30d771b11e547ffd5f92be49e8908936c SHA256 8c1419b49933d85a53397e95ac268e11ea864f76a242cc02c604625bfdc5ff54
-DIST sane-1.0.18-brother-driver.diff.bz2 8335 RMD160 8d86dccca4054699e367412c25d80d8641de42ca SHA1 60bf9c8d4b2fac3f250a95d1dc8043662fc974cd SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b
-DIST sane-backends-1.0.18.tar.gz 3789493 RMD160 aa863adff417d7c33cbb85c193878aa54a056100 SHA1 f4c360b87ced287e4015a0dafd766ad885c539e1 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
-EBUILD sane-backends-1.0.18-r2.ebuild 4875 RMD160 ba1d9961c62414b2c8599b4bef47a4449c51c2c0 SHA1 17889c8e0f4c03c703df5cea6e8775ca7e8cd2f5 SHA256 c430679c752c18683379229dcba3d93b155a99f83c58435639465512e14e06d0

File media-gfx/sane-backends/files/sane-backends-1.0.17-doc.patch

-Index: hacking/sane-backends-1.0.17/configure.in
-===================================================================
---- hacking.orig/sane-backends-1.0.17/configure.in
-+++ hacking/sane-backends-1.0.17/configure.in
-@@ -44,6 +44,10 @@ AC_ARG_WITH(docdir, 
-   AC_SUBST([docdir],         ['${prefix}/doc/sane-${VERSION}'])dnl
- ])
- 
-+AC_ARG_ENABLE([doc],
-+  AS_HELP_STRING([--disable-doc],
-+                 [Avoid documentation creation]))
-+
- dnl ***********************************************************************
- dnl Checks for programs.
- dnl ***********************************************************************
-@@ -56,9 +60,15 @@ AC_PATH_PROG(SANE_CONFIG_PATH, sane-conf
- AC_PATH_PROG(MSGFMT, msgfmt$EXEEXT, no)
- AC_PATH_PROG(XGETTEXT, xgettext$EXEEXT, no)
- AC_PATH_PROG(MSGMERGE, msgmerge$EXEEXT, no)
--AC_PATH_PROG(LATEX, latex$EXEEXT, no)
--AC_PATH_PROG(DVIPS, dvips$EXEEXT, no)
--AC_PATH_PROG(MAKEINDEX, makeindex$EXEEXT, no)
-+if test "x$enable_doc" != "xno"; then
-+  AC_PATH_PROG(LATEX, latex$EXEEXT, no)
-+  AC_PATH_PROG(DVIPS, dvips$EXEEXT, no)
-+  AC_PATH_PROG(MAKEINDEX, makeindex$EXEEXT, no)
-+else
-+  LATEX="no"
-+  DVIPS="no"
-+  MAKEINDEX="no"
-+fi
- AC_PATH_PROG(MAKEDEPEND, makedepend$EXEEXT, no)
- AC_SUBST(MSGFMT)
- AC_SUBST(XGETTEXT)

File media-gfx/sane-backends/files/udev-rule.patch

---- 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");

File media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild

-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic autotools
-
-IUSE="usb ipv6"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-BROTHERMFCPATCHVER="1.0.18"
-BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-BACKENDS_NODEPS="abaton agfafocus apple artec as6e avision bh canon
-	canon630u coolscan coolscan2 dc25 dmc
-	epson fujitsu genesys gt68xx hp leo lexmark 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 snapscan niash sm3840 hp4200
-	sm3600 hp3500 stv680"
-
-# These are not in the main list for some reasons
-BACKENDS_NODEPS="${BACKENDS_NODEPS} mustek_usb2 net pnm"
-# This is enabled only with +usb actually
-BACKENDS_NODEPS="${BACKENDS_NODEPS} brother"
-# This should require libjpeg but we always require it
-BACKENDS_NODEPS="${BACKENDS_NODEPS} dc210 dc240"
-
-BACKENDS_IEEE1284="canon_pp hpsj5s mustek_pp"
-BACKENDS_GPHOTO2="gphoto2"
-BACKENDS_LINUX="pint qcam v4l"
-
-BACKENDS_ALL="${BACKENDS_NODEPS} ${BACKENDS_JPEG} ${BACKENDS_IEEE1284}
-	${BACKENDS_GPHOTO2} ${BACKENDS_LINUX}"
-
-IEEE1284_DEPS="x86? ( sys-libs/libieee1284 ) amd64? ( sys-libs/libieee1284 )"
-GPHOTO2_DEPS="media-libs/libgphoto2"
-LINUX_DEPS="virtual/os-headers"
-BROTHER_URI="usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-
-for backend in ${BACKENDS_ALL}; do
-	IUSE="${IUSE} sane_backends_${backend}"
-	IEEE1284_DEPS="!sane_backends_${backend}? ( ${IEEE1284_DEPS} )"
-	GPHOTO2_DEPS="!sane_backends_${backend}? ( ${GPHOTO2_DEPS} )"
-	LINUX_DEPS="!sane_backends_${backend}? ( ${LINUX_DEPS} )"
-	BROTHER_URI="!sane_backends_${backend}? ( ${BROTHER_URI} )"
-done
-
-for backend in ${BACKENDS_IEEE1284}; do
-	IEEE1284_DEPS="${IEEE1284_DEPS} sane_backends_${backend}? ( sys-libs/libieee1284 )"
-done
-
-for backend in ${BACKENDS_GPHOTO2}; do
-	GPHOTO2_DEPS="${GPHOTO2_DEPS} sane_backends_${backend}? ( media-libs/libgphoto2 )"
-done
-
-for backend in ${BACKENDS_LINUX}; do
-	LINUX_DEPS="${LINUX_DEPS} sane_backends_${backend}? ( virtual/os-headers )"
-done
-
-RDEPEND="${IEEE1284_DEPS}
-	${GPHOTO2_DEPS}
-	>=media-libs/jpeg-6b
-	usb? ( >=dev-libs/libusb-0.1.8 )"
-
-DEPEND="${RDEPEND}
-	${LINUX_DEPS}
-	>=sys-apps/sed-4"
-
-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
-	${BROTHER_URI}
-	sane_backends_brother? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-
-pkg_setup() {
-	enewgroup scanner
-}
-
-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}
-
-	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
-
-	eautoreconf
-
-	# Simply check if it exists, as it will exist when it's enabled directly or
-	# by the bulk
-	if [[ -f ${WORKDIR}/${BROTHERMFCDRIVER} ]] ; 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.patch
-}
-
-src_compile() {
-	local myconf
-
-	# Better safe than sorry, it dereferences type-punned pointers
-	append-flags -fno-strict-aliasing
-
-	if [[ -n ${SANE_BACKENDS} ]]; then
-		einfo "Going to enable the following backends: ${SANE_BACKENDS}"
-		myconf="$(use_with sane_backends_gphoto2 gphoto2)"
-	else
-		myconf="--with-gphoto2"
-	fi
-
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${SANE_BACKENDS}" \
-	econf \
-		$(use_enable usb libusb) \
-		$(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
-}