Fix older hplip versions policykit depend as well, polkit-1 support is there

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

5 files changed, 12 insertions, 11 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index a2c098daca1b..0b6b04f91740 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,8 +1,9 @@
 # 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.168 2010/10/06 18:47:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.169 2010/10/10 11:39:03 ssuominen Exp $
 
-  06 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> hplip-3.10.9.ebuild:
+  10 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> hplip-3.10.9.ebuild,
+  hplip-3.10.6.ebuild, hplip-3.9.12-r1.ebuild:
   Fix PolicyKit dependencies (polkit-1 support is present).
 
 *hplip-3.10.9 (04 Oct 2010)
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 2fd602d7923e..9ab51a198b51 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -7,8 +7,8 @@ AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95
 DIST hplip-3.10.6.tar.gz 21577342 RMD160 a5194123a584bad62b1a04fbd05aca7f22ddc03c SHA1 1dc507340f8087bdeefb804c7771410bf958d564 SHA256 3ee0e68a613d2b966dcb6df9fd8e074c4c3e590249e61c0d792de3373b84fdeb
 DIST hplip-3.10.9.tar.gz 21818298 RMD160 37f512c73768e7a02bdf2814bb7528804cfada32 SHA1 5e145eafefbc5122bbe98345f2984fc0a55e5787 SHA256 1d34630084eccfcc80c08065becdf9313fd8f5a09a4cf523dbd9d3ec724206b9
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
-EBUILD hplip-3.10.6.ebuild 7526 RMD160 8c51c0cc1fdc7b01df2c29a4d29f91f5038fa4a4 SHA1 0cf116f37bf2bef9e80f1dfd4dad6f8ec87ad64f SHA256 e5e7ca431eb743fb43335d9e8d959f405372872859fc2614962b8592ee9afeb8
+EBUILD hplip-3.10.6.ebuild 7526 RMD160 f518bc3e654136513772ce61680a014bdb2161c2 SHA1 5e7ece1a1e0c8933de45e33fa603e4d0de689565 SHA256 b673fcf966c8ef2258d9e6dc281f4d9f05e851e0774320e90f8c823a33a290d8
 EBUILD hplip-3.10.9.ebuild 7639 RMD160 ce43f140827aff3c0dde013fdd6e42ba9bfe32f7 SHA1 3a57f9bdcc2efd732728fc99b59135364763c1e5 SHA256 5ab9e325bf4fddc39f3b8d0726ac6dd7ff29b9f23f23f54a4a47279a7337c943
-EBUILD hplip-3.9.12-r1.ebuild 8208 RMD160 f79073fe4ab4bf42230e36845cbd8c661b312316 SHA1 d89236a53a19d44d360d00627c9ba5ef92ae3856 SHA256 7f058d034d324ea2cd318f453ccbbe29a0d5224a2813bc7d9dc2b925aa0cc3b3
-MISC ChangeLog 29482 RMD160 9007e586e79b824ad4658000b4ced401b8f940db SHA1 cd25c288986ccc899481731e87526821f6cd798a SHA256 5b3be770cb8325351fa8ce09d9d39bc3dbc8ffb3e99f02b699a5d4708ec9f173
-MISC metadata.xml 1994 RMD160 ca315b28ff560edf48fa135b4b26de6e82811ab4 SHA1 9e96be45cadad0b7bc679cbdfdf65b27444800ff SHA256 5e693745a5045c565817fc5a11e6d5a547e5a59edbbc4277308e829f308cbddb
+EBUILD hplip-3.9.12-r1.ebuild 8209 RMD160 57e12ad8228f4822483265251908cba145712056 SHA1 a5e2d85ce57174c277b919777289ab8cad610d43 SHA256 27e13d0598e238a2c751512ec24ca1263de3e1a0e3982c238ddf44f14d55f64b
+MISC ChangeLog 29529 RMD160 c0b6cb197c5cc10e0f344b9ed6c3f0a451eea53e SHA1 8cd61c6578f4c86a4f963e4784e4bf78569d844b SHA256 cb9faef946914afc76a918af94bb3efbf2c8e7cbbdfa8c93960d4fb564676ff8
+MISC metadata.xml 1991 RMD160 7015fb373c7d10ca888c4d36fe970c0b5bd0f280 SHA1 73a4239ab13b8044c84e8ffcf659ab60be0a8059 SHA256 bb0580ebfe0a576acde129f9ed16b5455274fc7f03c6eb9adac2fb94c6735de1
diff --git a/net-print/hplip/hplip-3.10.6.ebuild b/net-print/hplip/hplip-3.10.6.ebuild
index 83b9a777e133..4cbec9d9c162 100644
--- a/net-print/hplip/hplip-3.10.6.ebuild
+++ b/net-print/hplip/hplip-3.10.6.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.6.ebuild,v 1.2 2010/08/28 15:02:44 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.6.ebuild,v 1.3 2010/10/10 11:39:03 ssuominen Exp $
 
 EAPI=2
 
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
 				dev-python/notify-python
 			)
 			policykit? (
-				sys-auth/policykit
+				sys-auth/polkit
 			)
 		)
 	)"
diff --git a/net-print/hplip/hplip-3.9.12-r1.ebuild b/net-print/hplip/hplip-3.9.12-r1.ebuild
index fbf067c3c608..5d03c9a5fd57 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.9 2010/05/04 19:30:24 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild,v 1.10 2010/10/10 11:39:03 ssuominen Exp $
 
 EAPI=2
 
@@ -56,7 +56,7 @@ RDEPEND="${COMMON_DEPEND}
 				dev-python/notify-python
 			)
 			policykit? (
-				sys-auth/policykit
+				sys-auth/polkit
 			)
 		)
 	)"
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index a6b05e4be6c1..806b336144e1 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -23,7 +23,7 @@
 		<flag name="libnotify">Enables desktop notifications</flag>
 		<flag name="minimal">Only build internal hpijs/hpcups driver (not recommended at all, make sure you know what you are doing)</flag>
 		<flag name="parport">Enable parallel port for devices which require it</flag>
-		<flag name="policykit">Enable sys-auth/policykit authentication support</flag>
+		<flag name="policykit">Enable sys-auth/polkit authentication support</flag>
 		<flag name="qt4">Enable graphical interface using Qt 4</flag>
 		<flag name="scanner">Enable scanner on multifunction devices which support it</flag>
 		<flag name="snmp">Add support for <pkg>net-analyzer/net-snmp</pkg> which enables this driver to work over networks (both for server and client)</flag>