summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2010-04-08 18:56:13 +0000
committerDaniel Pielmeier <billie@gentoo.org>2010-04-08 18:56:13 +0000
commit444fdf4914aa31edb0cf56ea20cc445d52be67c1 (patch)
treeee169b2a5182c8cebe27891dfbdbddf6b45cd8c9 /net-print/hplip/hplip-3.9.12-r1.ebuild
parentsparc stable wrt #308859 (diff)
downloadgentoo-2-444fdf4914aa31edb0cf56ea20cc445d52be67c1.tar.gz
gentoo-2-444fdf4914aa31edb0cf56ea20cc445d52be67c1.tar.bz2
gentoo-2-444fdf4914aa31edb0cf56ea20cc445d52be67c1.zip
Fix scanner dependencies. Remove old.
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'net-print/hplip/hplip-3.9.12-r1.ebuild')
-rw-r--r--net-print/hplip/hplip-3.9.12-r1.ebuild10
1 files changed, 5 insertions, 5 deletions
diff --git a/net-print/hplip/hplip-3.9.12-r1.ebuild b/net-print/hplip/hplip-3.9.12-r1.ebuild
index 993e44c370b6..fb81016d0e69 100644
--- a/net-print/hplip/hplip-3.9.12-r1.ebuild
+++ b/net-print/hplip/hplip-3.9.12-r1.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/net-print/hplip/hplip-3.9.12-r1.ebuild,v 1.6 2010/03/04 22:15:35 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild,v 1.7 2010/04/08 18:56:13 billie Exp $
EAPI=2
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
# zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
+IUSE="doc fax +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl X"
COMMON_DEPEND="
media-libs/jpeg
@@ -43,8 +43,8 @@ RDEPEND="${COMMON_DEPEND}
dev-python/pygobject
kernel_linux? ( >=sys-fs/udev-114 )
scanner? (
- gtk? ( media-gfx/xsane )
- !gtk? ( || ( media-gfx/sane-frontends dev-python/imaging ) )
+ dev-python/imaging
+ X? ( || ( media-gfx/xsane media-gfx/sane-frontends ) )
)
fax? (
dev-python/reportlab
@@ -67,7 +67,7 @@ ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel
pkg_setup() {
! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
- use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
+ use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
if ! use hpcups && ! use hpijs ; then
ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"