Correct DEPEND, bug 168179

Package-Manager: portage-2.1.2-r12

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 4e7e5f0c26461c835bf43cd6430683dc9b8df7ec..7769c839593642e8b93d0215ead8713f4a3f2328 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.51 2007/03/03 17:01:58 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.52 2007/03/04 23:24:24 genstef Exp $
+
+  04 Mar 2007; <genstef@gentoo.org> hplip-1.7.2.ebuild:
+  Correct DEPEND, bug 168179
 
 *hplip-1.7.2 (03 Mar 2007)
 

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 2a377e8757d31684413ad33c924f76f2042b03c4..fa8449f696690ba0985d8501d896fccd568a0506 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -16,14 +16,14 @@ EBUILD hplip-1.6.10.ebuild 3668 RMD160 ee5e398e2b7456771ea1b25a8ab065b272bf2719
 MD5 e3d41520f8279ebeeca3b3baea622010 hplip-1.6.10.ebuild 3668
 RMD160 ee5e398e2b7456771ea1b25a8ab065b272bf2719 hplip-1.6.10.ebuild 3668
 SHA256 57e4cfb57dda84f7c4783bdc40176ac6b9087c9b47b308470f1a61e56fed6f92 hplip-1.6.10.ebuild 3668
-EBUILD hplip-1.7.2.ebuild 3208 RMD160 47f824f73225aa877c4d32727ea7d5b21354429e SHA1 c253680d731493b28842b8af8586d44f91653ce3 SHA256 d4896f85a67e0e1dc4609b3501f23f041657cce73270872de6f4c0e7a50fc9c6
-MD5 84d5482719a7978476ed297ee207fd31 hplip-1.7.2.ebuild 3208
-RMD160 47f824f73225aa877c4d32727ea7d5b21354429e hplip-1.7.2.ebuild 3208
-SHA256 d4896f85a67e0e1dc4609b3501f23f041657cce73270872de6f4c0e7a50fc9c6 hplip-1.7.2.ebuild 3208
-MISC ChangeLog 9295 RMD160 7c7039809218da2b41c30bb2ee151548e32cefe6 SHA1 dff366d9a94f9eea696eff674da0e77b37fc65e8 SHA256 6878e4711b45d15b93f8aa686ce297ff2c13006e5b4dcb9761751c6ecb4ac1aa
-MD5 6e8b7f769fbbc324acf3e659902fd97c ChangeLog 9295
-RMD160 7c7039809218da2b41c30bb2ee151548e32cefe6 ChangeLog 9295
-SHA256 6878e4711b45d15b93f8aa686ce297ff2c13006e5b4dcb9761751c6ecb4ac1aa ChangeLog 9295
+EBUILD hplip-1.7.2.ebuild 3289 RMD160 3ea6c6ff6ec92e97465f907b07ae8c485d4bd4ce SHA1 5cb2581fae96baaa71109cb4881d6f58009fd59a SHA256 1819096e985a682d5cea7e90a0c9acb1e5e956d83ddced5c706e05ab5a2df56a
+MD5 2ba79c101342e2cc291aa4dc3d7b1d2e hplip-1.7.2.ebuild 3289
+RMD160 3ea6c6ff6ec92e97465f907b07ae8c485d4bd4ce hplip-1.7.2.ebuild 3289
+SHA256 1819096e985a682d5cea7e90a0c9acb1e5e956d83ddced5c706e05ab5a2df56a hplip-1.7.2.ebuild 3289
+MISC ChangeLog 9378 RMD160 a74f7fc2ee3b5071fdc29fc6f0c49ee0a5f694fd SHA1 9d0951b8a2c5ca11501d6c04a8f00baed05405e4 SHA256 496ff733e04079074daf0a792323f5c0680a4bfaa795e98366fa61bfd50c5d8a
+MD5 39aa2ee03bff82cbcab7d07aa35db58c ChangeLog 9378
+RMD160 a74f7fc2ee3b5071fdc29fc6f0c49ee0a5f694fd ChangeLog 9378
+SHA256 496ff733e04079074daf0a792323f5c0680a4bfaa795e98366fa61bfd50c5d8a ChangeLog 9378
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161

diff --git a/net-print/hplip/hplip-1.7.2.ebuild b/net-print/hplip/hplip-1.7.2.ebuild
index efa71a4f0c58683422dbb575cf451e2fa08c5430..1d9ae561fddf599651c6a70f3a3b55d81673903e 100644 (file)
--- a/net-print/hplip/hplip-1.7.2.ebuild
+++ b/net-print/hplip/hplip-1.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.7.2.ebuild,v 1.1 2007/03/03 17:01:58 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.7.2.ebuild,v 1.2 2007/03/04 23:24:24 genstef Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt3 ppds scanner"
+IUSE="foomaticdb snmp qt3 ppds scanner X"
 
 DEPEND=">=dev-lang/python-2.2.0
        snmp? ( >=net-analyzer/net-snmp-5.0.9 )
@@ -25,10 +25,14 @@ DEPEND=">=dev-lang/python-2.2.0
        virtual/ghostscript
        scanner? (
                >=media-gfx/sane-backends-1.0.9
-               || (
-                       X? ( >=media-gfx/xsane-0.89 )
+               X? ( || (
+                       >=media-gfx/xsane-0.89
                        >=media-gfx/sane-frontends-1.0.9
-               )
+                       ) )
+               !X? ( || ( 
+                       >=media-gfx/sane-frontends-1.0.9
+                       >=media-gfx/xsane-0.89
+                       ) )
        )
        qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
        >=dev-libs/libusb-0.1.10a