From 7a565d73402ecc55dfb72d66a56d43ea887cab40 Mon Sep 17 00:00:00 2001 From: Daniel Pielmeier Date: Tue, 18 Sep 2012 18:10:42 +0000 Subject: Remove dependency upon udev-acl. This fixes bug #435226. Thanks to Samuli Suominen for the report. (Portage version: 2.1.11.9/cvs/Linux i686) --- net-print/hplip/ChangeLog | 7 ++++++- net-print/hplip/hplip-3.11.10.ebuild | 9 ++++----- net-print/hplip/hplip-3.12.4.ebuild | 7 +++---- net-print/hplip/hplip-3.12.6-r1.ebuild | 10 +++------- net-print/hplip/hplip-3.12.9.ebuild | 10 +++------- 5 files changed, 19 insertions(+), 24 deletions(-) (limited to 'net-print/hplip') diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index 4d9864db25de..532c5edcbb3f 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/hplip # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.235 2012/09/16 16:29:12 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.236 2012/09/18 18:10:42 billie Exp $ + + 18 Sep 2012; Daniel Pielmeier hplip-3.11.10.ebuild, + hplip-3.12.4.ebuild, hplip-3.12.6-r1.ebuild, hplip-3.12.9.ebuild: + Remove dependency upon udev-acl. This fixes bug #435226. Thanks to Samuli + Suominen for the report. *hplip-3.12.9 (16 Sep 2012) diff --git a/net-print/hplip/hplip-3.11.10.ebuild b/net-print/hplip/hplip-3.11.10.ebuild index 13b3d1970ee8..663d5f2c9f66 100644 --- a/net-print/hplip/hplip-3.11.10.ebuild +++ b/net-print/hplip/hplip-3.11.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.10.ebuild,v 1.10 2012/05/05 15:50:38 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.10.ebuild,v 1.11 2012/09/18 18:10:42 billie Exp $ EAPI=3 @@ -20,12 +20,11 @@ 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 -acl X" +IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X" COMMON_DEPEND=" virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) - acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] =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 -acl X" +IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X" COMMON_DEPEND=" virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) - acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] =net-print/cups-1.4.0 virtual/libusb:0 @@ -185,6 +184,7 @@ src_configure() { --disable-foomatic-rip-hplip-install \ --disable-shadow-build \ --disable-qt3 \ + --disable-udev-acl-rules \ --with-cupsbackenddir=$(cups-config --serverbin)/backend \ --with-cupsfilterdir=$(cups-config --serverbin)/filter \ --with-docdir=/usr/share/doc/${PF} \ @@ -197,7 +197,6 @@ src_configure() { $(use_enable parport pp-build) \ $(use_enable scanner scan-build) \ $(use_enable snmp network-build) \ - $(use_enable acl udev-acl-rules) \ $(use_enable qt4 gui-build) \ $(use_enable qt4) \ $(use_enable policykit) diff --git a/net-print/hplip/hplip-3.12.6-r1.ebuild b/net-print/hplip/hplip-3.12.6-r1.ebuild index 5a4c5895954a..6cda4fc10a3a 100644 --- a/net-print/hplip/hplip-3.12.6-r1.ebuild +++ b/net-print/hplip/hplip-3.12.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.6-r1.ebuild,v 1.2 2012/08/18 08:31:27 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.6-r1.ebuild,v 1.3 2012/09/18 18:10:42 billie Exp $ EAPI=4 @@ -21,15 +21,11 @@ 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 -acl X" +IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X" -# udev-acl has been moved as part of consolekit and is legacy code that -# shouldn't be used anymore. figure out dropping USE=acl also from hplip? -# -ssuominen 2012, August COMMON_DEPEND=" virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) - acl? ( || ( >sys-auth/consolekit-0.4.5[acl] =net-print/cups-1.4.0 virtual/libusb:1 @@ -192,6 +188,7 @@ src_configure() { --disable-qt3 \ --disable-libusb01_build \ --disable-udev_sysfs_rules \ + --disable-udev-acl-rules \ --with-cupsbackenddir=$(cups-config --serverbin)/backend \ --with-cupsfilterdir=$(cups-config --serverbin)/filter \ --with-docdir=/usr/share/doc/${PF} \ @@ -204,7 +201,6 @@ src_configure() { $(use_enable parport pp-build) \ $(use_enable scanner scan-build) \ $(use_enable snmp network-build) \ - $(use_enable acl udev-acl-rules) \ $(use_enable qt4 gui-build) \ $(use_enable qt4) \ $(use_enable policykit) diff --git a/net-print/hplip/hplip-3.12.9.ebuild b/net-print/hplip/hplip-3.12.9.ebuild index ac1f51ea5ad9..93e453d92f23 100644 --- a/net-print/hplip/hplip-3.12.9.ebuild +++ b/net-print/hplip/hplip-3.12.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.9.ebuild,v 1.1 2012/09/16 16:29:12 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.9.ebuild,v 1.2 2012/09/18 18:10:42 billie Exp $ EAPI=4 @@ -21,15 +21,11 @@ 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 -acl X" +IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X" -# udev-acl has been moved as part of consolekit and is legacy code that -# shouldn't be used anymore. figure out dropping USE=acl also from hplip? -# -ssuominen 2012, August COMMON_DEPEND=" virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) - acl? ( || ( >sys-auth/consolekit-0.4.5[acl] =net-print/cups-1.4.0 virtual/libusb:1 @@ -192,6 +188,7 @@ src_configure() { --disable-qt3 \ --disable-libusb01_build \ --disable-udev_sysfs_rules \ + --disable-udev-acl-rules \ --with-cupsbackenddir=$(cups-config --serverbin)/backend \ --with-cupsfilterdir=$(cups-config --serverbin)/filter \ --with-docdir=/usr/share/doc/${PF} \ @@ -204,7 +201,6 @@ src_configure() { $(use_enable parport pp-build) \ $(use_enable scanner scan-build) \ $(use_enable snmp network-build) \ - $(use_enable acl udev-acl-rules) \ $(use_enable qt4 gui-build) \ $(use_enable qt4) \ $(use_enable policykit) -- cgit v1.2.3-65-gdbad