Fix dependencies especially RDEPEND vs. DEPEND. Move the snmp use flag out of !minimal as it is needed for a minimal build. This fixes bug #292976, thanks to David Honour for reporting. Move dev-python/pygobject out of the qt4 use flag. media-gfx/sane-frontends dev-python/imaging are equal non-gui scanner frontends.

(Portage version: 2.1.7.17/cvs/Linux i686)

3 files changed, 25 insertions, 20 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 6b0a13f4f39d..f33abec411ec 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.148 2010/03/02 12:46:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.149 2010/03/04 22:15:35 billie Exp $
+
+  04 Mar 2010; Daniel Pielmeier <billie@gentoo.org> hplip-3.9.12-r1.ebuild,
+  hplip-3.10.2.ebuild:
+  Fix dependencies especially RDEPEND vs. DEPEND. Move the snmp use flag out
+  of !minimal as it is needed for a minimal build. This fixes bug #292976,
+  thanks to David Honour for reporting. Move dev-python/pygobject out of the
+  qt4 use flag. media-gfx/sane-frontends dev-python/imaging are equal
+  non-gui scanner frontends.
 
   02 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   hplip-3.9.12-r1.ebuild:
diff --git a/net-print/hplip/hplip-3.10.2.ebuild b/net-print/hplip/hplip-3.10.2.ebuild
index 5c33b3973a70..80698faa24d9 100644
--- a/net-print/hplip/hplip-3.10.2.ebuild
+++ b/net-print/hplip/hplip-3.10.2.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.10.2.ebuild,v 1.1 2010/02/28 12:21:59 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2.ebuild,v 1.2 2010/03/04 22:15:35 billie Exp $
 
 EAPI=2
 
@@ -21,16 +21,16 @@ COMMON_DEPEND="
 	media-libs/jpeg
 	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
 	udev-acl? ( >=sys-fs/udev-145[extras] )
+	snmp? (
+		net-analyzer/net-snmp
+		dev-libs/openssl
+	)
 	!minimal? (
 		net-print/cups
 		virtual/libusb:0
 		>=dev-lang/python-2.4.4[threads,xml]
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
 		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
 	)"
 
 DEPEND="${COMMON_DEPEND}
@@ -38,9 +38,9 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	>=app-text/ghostscript-gpl-8.70
-	dev-python/pygobject
 	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	!minimal? (
+		dev-python/pygobject
 		kernel_linux? ( >=sys-fs/udev-114 )
 		scanner? (
 			gtk? ( media-gfx/xsane )
diff --git a/net-print/hplip/hplip-3.9.12-r1.ebuild b/net-print/hplip/hplip-3.9.12-r1.ebuild
index 5f7dade8ee85..993e44c370b6 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.5 2010/03/02 12:46:29 phajdan.jr Exp $
+# $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 $
 
 EAPI=2
 
@@ -17,44 +17,41 @@ 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"
 
-# Note : libusb-compat untested (calchan 20090516)
-
 COMMON_DEPEND="
-	app-text/ghostscript-gpl
 	media-libs/jpeg
 	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	udev-acl? ( >=sys-fs/udev-145[extras] )
+	snmp? (
+		net-analyzer/net-snmp
+		dev-libs/openssl
+	)
 	!minimal? (
 		net-print/cups
 		virtual/libusb:0
 		>=dev-lang/python-2.4.4[threads,xml]
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
+		fax? ( sys-apps/dbus )
 	)"
 
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	!minimal? (
+		dev-python/pygobject
 		kernel_linux? ( >=sys-fs/udev-114 )
 		scanner? (
-			dev-python/imaging
 			gtk? ( media-gfx/xsane )
-			!gtk? ( media-gfx/sane-frontends )
+			!gtk? ( || ( media-gfx/sane-frontends dev-python/imaging ) )
 		)
 		fax? (
 			dev-python/reportlab
-			sys-apps/dbus
 			dev-python/dbus-python
 		)
 		qt4? (
 			dev-python/PyQt4[dbus,X]
-			dev-python/pygobject
 			libnotify? (
 				dev-python/notify-python
 			)