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.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 28 insertions, 23 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/Manifest b/net-print/hplip/Manifest
index 8323d24d7071..354c9142969c 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -11,8 +11,8 @@ DIST hplip-3.10.2.tar.gz 21446275 RMD160 4483bd497bbc272812c31db574b75f6e5c03b39
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
 DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
 EBUILD hplip-2.8.6b.ebuild 5005 RMD160 82e7b5ead2995a382208be0718706f5f20d3960a SHA1 a42a1f47a85512a001b6bc4bb876f254328578f3 SHA256 f3fd276043f96b9d1354011b14d5966f074365f6b99734ad6b9c95af48d84bfb
-EBUILD hplip-3.10.2.ebuild 7571 RMD160 ed901422e3e5ccef6b9281d8da43b9cacab27e53 SHA1 c19f713e8dd92d1536f91ff55f8c7fddd85ea230 SHA256 ce356280399927363ba06743e2dd03935a4890f47ab32c9175643949db319864
-EBUILD hplip-3.9.12-r1.ebuild 8322 RMD160 f9308b892861ff6efb9c78620ce68a57e0b44e81 SHA1 414ee95d6309ac3ae42e9a13ec3ab0b7951b5fe6 SHA256 60941111f883d3ce7270474e7769da6e78204ff1420adffb0b876a818d262c82
+EBUILD hplip-3.10.2.ebuild 7568 RMD160 cdbbc568a56dca290cedbb8f93a6249fe19e9aa4 SHA1 4833099366e43895c4580c84117b1ec87d10b590 SHA256 2e820ee692618aaa5a2a4e61350f8d178cbcad39fca7139fc6ce6b72162f304f
+EBUILD hplip-3.9.12-r1.ebuild 8273 RMD160 8574eb70cddf9e2674eafa502eb7b789fb5b0f7c SHA1 d388576e5511bef896d1fb124aa956b8ab1eefec SHA256 4674b6fa5e1d53e2bac0af0f935cb67adf55d337127f4858dcb6f8f3adb2dc5a
 EBUILD hplip-3.9.8-r3.ebuild 7779 RMD160 3f70dc5fdcb0bbc144fbc5c8f4447a610a4d73bc SHA1 b568fc96d26c07d19e6e9a43527836590a942b42 SHA256 6538e4aba085a1a148129faf620c39ca108f24bb83e3cebebf2fc817afe3b7e3
-MISC ChangeLog 25481 RMD160 057df1c2321a257bf82293bf809b6d473b18892e SHA1 67410e8323018c7e246035648f97a23ad966f37e SHA256 a47beb961ba8cd959f2db41b199dd597c9ac8c98dbcf710cd084d72848f485d1
+MISC ChangeLog 25905 RMD160 50eee469aa6e4090991db9cab8271c221fc7674f SHA1 a3b4141312adcbc316f211aee97039deabd6f7ed SHA256 e5d5accb0c001fee0958efbca1b22feb2aa61ec6403afffaf1d9f5b53d1acd91
 MISC metadata.xml 2398 RMD160 ae945168b49eb9bef494295c09f2cc4fcd8cfb3d SHA1 a15f245061b070686071585f1a5bf7993e54e50a SHA256 e7502f347ef9fc7d4b6d2c79554531cf1cff901fed307f7d17b94fe09692cb71
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
 			)