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

(Portage version: 2.1.9.42/cvs/Linux i686)

4 files changed, 15 insertions, 10 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/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>