summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-14 19:41:41 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-14 19:41:41 +0000
commit4a5dd1ff924093c71832bad7c80024977ebb5972 (patch)
tree25840ff5a89ed7f439f1ea8aecb74905f70351de /media-gfx/sane-backends
parentUnmask SANE_BACKENDS="canon_pp hpsj5s mustek_pp" here. (diff)
downloadgentoo-2-4a5dd1ff924093c71832bad7c80024977ebb5972.tar.gz
gentoo-2-4a5dd1ff924093c71832bad7c80024977ebb5972.tar.bz2
gentoo-2-4a5dd1ff924093c71832bad7c80024977ebb5972.zip
Remove amd64/x86 check from here because it's been properly handled in profiles.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/sane-backends')
-rw-r--r--media-gfx/sane-backends/ChangeLog7
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild27
2 files changed, 11 insertions, 23 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index f50d1d64ad40..6fa3fd61e8c1 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/sane-backends
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.166 2010/01/02 23:08:34 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.167 2010/02/14 19:41:41 ssuominen Exp $
+
+ 14 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ sane-backends-1.0.20-r3.ebuild:
+ Remove amd64/x86 check from here because it's been properly handled in
+ profiles.
*sane-backends-1.0.20-r3 (02 Jan 2010)
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
index d849ae0bbbf3..f176637b06b2 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.20-r3.ebuild,v 1.1 2010/01/02 23:08:34 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild,v 1.2 2010/02/14 19:41:41 ssuominen Exp $
EAPI="1"
@@ -100,17 +100,10 @@ RDEPEND="
sane_backends_dc240? ( >=media-libs/jpeg-6b )
sane_backends_dell1600n_net? ( >=media-libs/jpeg-6b )
avahi? ( >=net-dns/avahi-0.6.24 )
- x86? (
- sane_backends_canon_pp? ( sys-libs/libieee1284 )
- sane_backends_hpsj5s? ( sys-libs/libieee1284 )
- sane_backends_mustek_pp? ( sys-libs/libieee1284 )
- )
- amd64? (
- sane_backends_canon_pp? ( sys-libs/libieee1284 )
- sane_backends_hpsj5s? ( sys-libs/libieee1284 )
- sane_backends_mustek_pp? ( sys-libs/libieee1284 )
- )
- usb? ( virtual/libusb:0 )
+ sane_backends_canon_pp? ( sys-libs/libieee1284 )
+ sane_backends_hpsj5s? ( sys-libs/libieee1284 )
+ sane_backends_mustek_pp? ( sys-libs/libieee1284 )
+ usb? ( virtual/libusb:0 )
gphoto2? (
media-libs/libgphoto2
>=media-libs/jpeg-6b
@@ -147,7 +140,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
BACKENDS=" "
pkg_setup() {
-
enewgroup scanner
use gphoto2 && BACKENDS="gphoto2"
@@ -157,15 +149,6 @@ pkg_setup() {
BACKENDS="${BACKENDS} ${backend}"
fi
done
- IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
- if ! use x86 && ! use amd64; then
- tmp="${IUSE_SANE_BACKENDS}"
- for backend in ${IEEE1284_BACKENDS}; do
- if [[ "${tmp/$backend/}" != "${IUSE_SANE_BACKENDS}" ]]; then
- ewarn "You selected a backend which is disabled because it's not usable in your arch."
- fi
- done
- fi
}
src_unpack() {