summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-03-25 22:15:48 +0000
committerMike Frysinger <vapier@gentoo.org>2014-03-25 22:15:48 +0000
commitdcecd1bd8ec448e7332e8bc34722820cbc766f89 (patch)
tree1b85bcec97befb74a1fb256eac15ad9192c0ab87 /media-gfx
parentBump to 1.7.2. Remove pyyaml dependency. (diff)
downloadgentoo-2-dcecd1bd8ec448e7332e8bc34722820cbc766f89.tar.gz
gentoo-2-dcecd1bd8ec448e7332e8bc34722820cbc766f89.tar.bz2
gentoo-2-dcecd1bd8ec448e7332e8bc34722820cbc766f89.zip
Disable backends by default if they require parallel ports.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/sane-backends/ChangeLog6
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild21
2 files changed, 18 insertions, 9 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 84cc2fa3d668..fa286b0f3f82 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/sane-backends
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.244 2014/03/03 19:00:08 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.245 2014/03/25 22:15:48 vapier Exp $
+
+ 25 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+ sane-backends-1.0.24-r3.ebuild:
+ Disable backends by default if they require parallel ports.
03 Mar 2014; Christopher Brannon <teiresias@gentoo.org>
files/sane-backends-1.0.24-systemd_pkgconfig.patch:
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
index cf619c0528e9..e8b0584734ba 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.24-r3.ebuild,v 1.1 2014/03/03 16:50:33 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild,v 1.2 2014/03/25 22:15:48 vapier Exp $
EAPI="5"
@@ -97,13 +97,18 @@ IUSE_SANE_BACKENDS="
IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd"
for backend in ${IUSE_SANE_BACKENDS}; do
- if [ ${backend} = pnm ]; then
- IUSE="${IUSE} -sane_backends_pnm"
- elif [ ${backend} = mustek_usb2 -o ${backend} = kvs40xx ]; then
- IUSE="${IUSE} sane_backends_${backend}"
- else
- IUSE="${IUSE} +sane_backends_${backend}"
- fi
+ case ${backend} in
+ # Disable backends that require parallel ports as no one has those anymore.
+ canon_pp|hpsj5s|mustek_pp|\
+ pnm)
+ IUSE+=" -sane_backends_${backend}"
+ ;;
+ mustek_usb2|kvs40xx)
+ IUSE+=" sane_backends_${backend}"
+ ;;
+ *)
+ IUSE+=" +sane_backends_${backend}"
+ esac
done
REQUIRED_USE="