Gentoo Archives: gentoo-commits

From: "Jean-Noel Rivasseau (elvanor)" <elvanor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/iscan: iscan-2.21.0.ebuild
Date: Thu, 01 Oct 2009 08:14:30
Message-Id: E1MtGnv-0003VF-34@stork.gentoo.org
1 elvanor 09/10/01 08:14:23
2
3 Modified: iscan-2.21.0.ebuild
4 Log:
5 Cleanup (bug #287211.)
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.4 media-gfx/iscan/iscan-2.21.0.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild?rev=1.4&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild?rev=1.4&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild?r1=1.3&r2=1.4
14
15 Index: iscan-2.21.0.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild,v
18 retrieving revision 1.3
19 retrieving revision 1.4
20 diff -u -r1.3 -r1.4
21 --- iscan-2.21.0.ebuild 24 Sep 2009 22:03:07 -0000 1.3
22 +++ iscan-2.21.0.ebuild 1 Oct 2009 08:14:22 -0000 1.4
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2009 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild,v 1.3 2009/09/24 22:03:07 flameeyes Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild,v 1.4 2009/10/01 08:14:22 elvanor Exp $
28
29 EAPI="2"
30
31 @@ -38,7 +38,7 @@
32 QA_TEXTRELS="usr/$(get_libdir)/iscan/lib*"
33
34 # Upstream ships broken sanity test
35 -RESTRICT=test
36 +RESTRICT="test"
37
38 RDEPEND="media-gfx/sane-backends
39 >=sys-fs/udev-103
40 @@ -98,19 +98,6 @@
41 echo 'LABEL="iscan_rules_end"'
42 }
43
44 -pkg_setup() {
45 - if use X || use gimp; then
46 - ewarn
47 - ewarn "The iscan application needs CSS x86/amd64-only"
48 - ewarn "libs and thus can't be built currently. You"
49 - ewarn "can still use 'xscanimage', 'xsane', or 'kooka'"
50 - ewarn "with sane-epkowa backend. But some low-end"
51 - ewarn "scanners are also not supported, because they"
52 - ewarn "need these x86/amd64 libs, too."
53 - ewarn
54 - fi
55 -}
56 -
57 src_prepare() {
58 local i
59
60 @@ -204,7 +191,7 @@
61 local i
62 local DLL_CONF="/etc/sane.d/dll.conf"
63 local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
64 - local SNAPSCAN_CONF="/etc/sane.d/snapscan.conf"
65 +
66 elog
67 if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
68 elog "Please edit ${EPKOWA_CONF} to suit your needs."
69 @@ -216,21 +203,4 @@
70 elog "A new entry 'epkowa' was added to ${DLL_CONF}"
71 elog "Please edit ${EPKOWA_CONF} to suit your needs."
72 fi
73 - elog
74 - elog "You can also use the 'snapscan' backend if you have a recent"
75 - elog "sane-backend installation."
76 - elog
77 - if ! grep 2>/dev/null -q "/usr/share/iscan/.*\.bin" "${SNAPSCAN_CONF}"; then
78 - snapscan_firmware "${SNAPSCAN_CONF}" > "${SNAPSCAN_CONF}~~~" \
79 - && mv -f "${SNAPSCAN_CONF}~~~" "${SNAPSCAN_CONF}" \
80 - || rm -f "${SNAPSCAN_CONF}~~~"
81 - elog "The firmware entries were added to ${SNAPSCAN_CONF}"
82 - else
83 - elog "Please edit ${SNAPSCAN_CONF} to suit your needs."
84 - fi
85 - elog "Hint: not all models are supported by 'snapscan' yet!"
86 - elog
87 - elog "You can check which backend fits best for your scanner:"
88 - elog "http://www.sane-project.org/cgi-bin/driver.pl?manu=Epson&bus=any"
89 - elog
90 }