Fix dependencies over cups to avoid downgrades to 1.3 for users with zeroconf USE flag enabled.

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

4 files changed, 27 insertions, 10 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index d29abe5389a2..b61bdc71aca1 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.133 2009/11/30 18:20:27 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.134 2009/12/01 11:18:46 flameeyes Exp $
+
+  01 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild:
+  Fix dependencies over cups to avoid downgrades to 1.3 for users with
+  zeroconf USE flag enabled.
 
   30 Nov 2009; Daniel Pielmeier <billie@gentoo.org> hplip-2.8.6b.ebuild,
   hplip-3.9.4b-r1.ebuild, hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index f71f1926f7e5..b4ea2ab7633f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.10-desktop.patch 492 RMD160 52a8bcf1544d0073920e00a383aeb22a9caf5487 SHA1 9394a73448b7b1b3ab1a014ab63b9edc731def66 SHA256 04bb5ef5ee4145eadc5f9e6498ca8a2d3d2277569b179263cb86f0f56231e462
@@ -7,8 +10,15 @@ DIST hplip-3.9.10.tar.gz 20999540 RMD160 65ea83e53bc19df0e2a054e723c74734fc5f39a
 DIST hplip-3.9.4b.tar.gz 15712313 RMD160 bfed762c59b8dc2210d450ba86a5636773831cc1 SHA1 d2b06f1ee347a1f3aacd6b52600d08fc71ac5b12 SHA256 57496c01fb3ead9678e630c1c4a385e156b76d328440da550ebfc24b95ff8b1a
 DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
 EBUILD hplip-2.8.6b.ebuild 5243 RMD160 340bda9d2f26d4a6440a06ab40d25f7bab6ec8b5 SHA1 bb3a445a0b8d433985876ef91c01b8f18968935e SHA256 771ac5ef5f0a0b9c089b21a46bf4809d2e867d62c7a1b5e48d70a0f8154488af
-EBUILD hplip-3.9.10.ebuild 8412 RMD160 71996a1579f1eba6c0f3332a5f2a0c5aa563198c SHA1 bc27ca434e1189f92bf36a70aa4d183167f5bd80 SHA256 e170517e36e50db7b3f87766da16fd5ecaedc547e84f8061eea195aed697b34c
+EBUILD hplip-3.9.10.ebuild 8478 RMD160 f74d121542c0f967a971fd5e9b8621833fcc803b SHA1 7453eff8457ef6eb6c4a00658feb0b36e07e0788 SHA256 1eaa43d61abc76498db83052223d2633e90df5cc9a46d78fc10353423eb89279
 EBUILD hplip-3.9.4b-r1.ebuild 6465 RMD160 99c22e2497c695a6f4756953ffba4006e035572c SHA1 739c86c85cc82a28c4344953be33d7a16573c5df SHA256 34547dc3ad9b7a905fc86380a10c8a8b8c010a3deb576544ac9f74b21e6d1840
-EBUILD hplip-3.9.8-r3.ebuild 8055 RMD160 2d9fb3b4fc8a540a74b9a6c5bcf23be8717471ae SHA1 bb57f5c44712c3dd25ac0fefd11ebca80e2ec640 SHA256 e61012f7187a44b3b6a59ccd31d1cb6f5522041beaefbc16067ae12ec43bfdcf
-MISC ChangeLog 22760 RMD160 67e699a46caf7ed137f482d37a0313815fad9489 SHA1 8f305afe91e81eed49f5689b4d96917c8d80c5e9 SHA256 d33da93941c1555c017189c0d00041f9078c7eb7d9e8491397c74193f14af297
+EBUILD hplip-3.9.8-r3.ebuild 8121 RMD160 ac29400dae4ddaf1ad5db40f4434481980e0d3e9 SHA1 9536ef91ee168c2d6e934d51d5c07a1f9bb3e810 SHA256 18348f0652b3bc708b1affaaca2a0c2bd4c8ed1a0b5ba25d2eea6c54b681fd72
+MISC ChangeLog 22966 RMD160 51e63a756edd55d57db9111af5d3d94262d3d03c SHA1 5bde5bcb3f70d07948a00122423156de07df289c SHA256 46160cb1ed0d7ccdf2725cfa3677b52a234be13ad0f679a0e56907870ff921fe
 MISC metadata.xml 2717 RMD160 b9498de6ef7a6c2a576e672b2116857ef1ec44b5 SHA1 810311f22a22a0d414525931c1ef4896abaf4840 SHA256 9e157960d81e23c7b7a56271f4e3cad18e450e238f4abe32ae6952cca4f0bc9f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksU+0wACgkQAiZjviIA2Xi2ywCfYjV47IK11O/YfcFvxr1iiltJ
+4vUAnil52s+bHjmKpfm2u6O8ZAoG5a8G
+=XoB3
+-----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.9.10.ebuild b/net-print/hplip/hplip-3.9.10.ebuild
index 1e4a6cd780de..8714173a9df8 100644
--- a/net-print/hplip/hplip-3.9.10.ebuild
+++ b/net-print/hplip/hplip-3.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.3 2009/11/30 18:20:27 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.4 2009/12/01 11:18:46 flameeyes Exp $
 
 EAPI="2"
 
@@ -22,10 +22,11 @@ COMMON_DEPEND="
 	virtual/ghostscript
 	media-libs/jpeg
 	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!static-ppds? ( || ( >=net-print/cups-1.4.0[zeroconf?] net-print/cupsddk ) )
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	udev-acl? ( >=sys-fs/udev-145[extras] )
 	!minimal? (
-		net-print/cups[zeroconf?]
+		!zeroconf? ( net-print/cups )
+		zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) )
 		virtual/libusb:0
 		>=dev-lang/python-2.4.4[threads,xml]
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
diff --git a/net-print/hplip/hplip-3.9.8-r3.ebuild b/net-print/hplip/hplip-3.9.8-r3.ebuild
index a4c837e04712..ed726cfa4891 100644
--- a/net-print/hplip/hplip-3.9.8-r3.ebuild
+++ b/net-print/hplip/hplip-3.9.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.2 2009/11/30 18:20:27 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.3 2009/12/01 11:18:46 flameeyes Exp $
 
 EAPI="2"
 
@@ -22,10 +22,11 @@ COMMON_DEPEND="
 	virtual/ghostscript
 	media-libs/jpeg
 	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!static-ppds? ( || ( >=net-print/cups-1.4.0[zeroconf?] net-print/cupsddk ) )
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	udev-acl? ( >=sys-fs/udev-145[extras] )
 	!minimal? (
-		net-print/cups[zeroconf?]
+		!zeroconf? ( net-print/cups )
+		zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) )
 		virtual/libusb:0
 		>=dev-lang/python-2.4.4[threads,xml]
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )