Fix udev dependency bug #370389. Thanks to William Hubbs for the report. Change udev-acl use flag to acl according to udev itself.

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

5 files changed, 22 insertions, 17 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index d5bccd110008..fe38ffe84e1a 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.185 2011/05/18 20:21:50 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.186 2011/06/07 16:37:53 billie Exp $
+
+  07 Jun 2011; Daniel Pielmeier <billie@gentoo.org> hplip-3.10.9-r1.ebuild,
+  hplip-3.11.5.ebuild, metadata.xml:
+  Fix udev dependency bug #370389. Thanks to William Hubbs for the report.
+  Change udev-acl use flag to acl according to udev itself.
 
 *hplip-3.11.5 (18 May 2011)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b517603feb64..20a7b96694a9 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -13,14 +13,14 @@ AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.10.9.tar.gz 21818298 RMD160 37f512c73768e7a02bdf2814bb7528804cfada32 SHA1 5e145eafefbc5122bbe98345f2984fc0a55e5787 SHA256 1d34630084eccfcc80c08065becdf9313fd8f5a09a4cf523dbd9d3ec724206b9
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
-EBUILD hplip-3.10.9-r1.ebuild 7555 RMD160 6826be4038a3df41fd4e13b8c69310f904e67c31 SHA1 b5a49874fc16a601ebe4e1f367907f465a3fc7ca SHA256 55e00fcef73203f11faec74c15ce1dd7a42361833a98692e53e0d13633484449
-EBUILD hplip-3.11.5.ebuild 7560 RMD160 9a600615a97069e047e02a7d5840928bd2f7b52f SHA1 6290f7b00294c0e34838a28f946f5773813ceb32 SHA256 ce5282b3791ddc73b45edc586e010dafe5c78f4ab7425342abe600f1b3bb3400
-MISC ChangeLog 32166 RMD160 393e624fc439dc830d1e73208059f9a8464a5578 SHA1 79b68c47266852c454185142329cb783447c1570 SHA256 0756121e5d5878f4a0e3ca83085f337ca03868b41a6e543224f0b3e89df897bc
-MISC metadata.xml 1811 RMD160 2a20a476a9af77a0ef1bf7eed7c9c4ddc08b8bff SHA1 e4840f886e1f190e118cc2a0d88c18841d89230a SHA256 951d82b7cd8554bb1f44363dbbe1fbe99608d6b1ff7cef87878ea59e38abe02e
+EBUILD hplip-3.10.9-r1.ebuild 7570 RMD160 ddf7fc3a51247ee8d5bb0e083cd175a0fdca8148 SHA1 75b114e414af90c9ea1b5aca5ca3ef1b723f9a51 SHA256 6e8606b9cf7e14a942a10e42b583e2b2b3513817693d22a32020d15f8eb14dd6
+EBUILD hplip-3.11.5.ebuild 7575 RMD160 5107f58e8f78f6033f9b944b9a05cf4027bb6f81 SHA1 e08b1e91939bf57d337592bc1ce06f6f6a9abdc9 SHA256 310709aa87ee975bc9d6c6cd1d80d1c7af8aa9fbf28dd6ec34108219e964dea7
+MISC ChangeLog 32415 RMD160 5b2940b4bce6f7970453149916fcf9620c92f404 SHA1 f5feab6c92cf328089826485272957d031eb9847 SHA256 a71e0b6b302de358b83fa30a8d0e3d4cc9bd9fda01dc14bd331a87405b15a9a0
+MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3UKmwACgkQlcuUeyFa0U0wBgCfZEbsZYt836omGWdClGewXJ5E
-PIYAni/4+qGpRu0A00rzp5QEoM7uQ3zb
-=OsRp
+iEYEARECAAYFAk3uVAUACgkQlcuUeyFa0U375gCfc1GkLnDcZJpcXBni4mhiCT1P
+OcgAoJgndl/YpTHFXEZdvyuWr1WeEI+S
+=tMhH
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.10.9-r1.ebuild b/net-print/hplip/hplip-3.10.9-r1.ebuild
index a5434478fc3c..b30f46161ff9 100644
--- a/net-print/hplip/hplip-3.10.9-r1.ebuild
+++ b/net-print/hplip/hplip-3.10.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.9-r1.ebuild,v 1.5 2011/02/14 19:53:23 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.9-r1.ebuild,v 1.6 2011/06/07 16:37:53 billie Exp $
 
 EAPI=2
 
@@ -20,12 +20,12 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86"
 
 # zeroconf does not work properly with >=cups-1.4.
 # Thus support for it is also disabled in hplip.
-IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl X"
+IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
 
 COMMON_DEPEND="
 	virtual/jpeg
 	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	udev-acl? ( >=sys-fs/udev-145[extras] )
+	acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
 	snmp? (
 		net-analyzer/net-snmp
 		dev-libs/openssl
@@ -235,7 +235,7 @@ src_configure() {
 		$(use_enable parport pp-build) \
 		$(use_enable scanner scan-build) \
 		$(use_enable snmp network-build) \
-		$(use_enable udev-acl udev-acl-rules)
+		$(use_enable acl udev-acl-rules)
 }
 
 src_install() {
diff --git a/net-print/hplip/hplip-3.11.5.ebuild b/net-print/hplip/hplip-3.11.5.ebuild
index a60a903c7ef2..a601edee4644 100644
--- a/net-print/hplip/hplip-3.11.5.ebuild
+++ b/net-print/hplip/hplip-3.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.5.ebuild,v 1.1 2011/05/18 20:21:50 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.5.ebuild,v 1.2 2011/06/07 16:37:53 billie Exp $
 
 EAPI=3
 
@@ -20,12 +20,12 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 # zeroconf does not work properly with >=cups-1.4.
 # Thus support for it is also disabled in hplip.
-IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl X"
+IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
 
 COMMON_DEPEND="
 	virtual/jpeg
 	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	udev-acl? ( >=sys-fs/udev-145[extras] )
+	acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
 	snmp? (
 		net-analyzer/net-snmp
 		dev-libs/openssl
@@ -235,7 +235,7 @@ src_configure() {
 		$(use_enable parport pp-build) \
 		$(use_enable scanner scan-build) \
 		$(use_enable snmp network-build) \
-		$(use_enable udev-acl udev-acl-rules)
+		$(use_enable acl udev-acl-rules)
 }
 
 src_install() {
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 4df5555198cd..a09526d7aa24 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -23,7 +23,7 @@
 		<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>
 		<flag name="static-ppds">Use statically-generated PPDs instead of Dynamic PPDs. Although this is deprecated some printers may still need it to work properly. Use this flag if hp-setup fails to find/create a valid PPD file</flag>
-		<flag name="udev-acl">Install udev acl rules which needs <pkg>sys-fs/udev</pkg> with acl support</flag>
+		<flag name="acl">Install udev acl rules which needs <pkg>sys-fs/udev</pkg> with acl support</flag>
 		<flag name="X">Enables scanner GUI dependencies with USE="scanner" where <pkg>media-gfx/xsane</pkg> is preferred over <pkg>media-gfx/sane-frontends</pkg></flag>
 	</use>
 </pkgmetadata>