Remove dependency upon udev-acl. This fixes bug #435226. Thanks to Samuli Suominen for the report.

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

6 files changed, 27 insertions, 32 deletions

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 <billie@gentoo.org> 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/Manifest b/net-print/hplip/Manifest
index 2381aab17ba4..89192a7bed5e 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -15,16 +15,16 @@ DIST hplip-3.12.6-patches-2.tar.xz 11324 SHA256 c1923ed3f5d0256e42907f631a185135
 DIST hplip-3.12.6.tar.gz 21227044 SHA256 54578000792969adb583e75efeacb9c46ab69659ec7e9424de390613f3595775 SHA512 39fefb59e01739aeffb013690e514ee73a93b2d26e1ee03c77d9c28b80de7fdb10496a1d1295328ea0b0948bfdc5b0bf0c67b6dd94b532290524a023bb7e4283 WHIRLPOOL 0564044242be8f6c98ac0cf256ded022378d076d0fbd04568a7ec120b85c80e4892a67a03dad145a58c9853bca6a31edf4293d2ccbb81f3d1d4746aab71c56a5
 DIST hplip-3.12.9-patches-1.tar.xz 10128 SHA256 a3a81a5c918aa5342b603843805eb582a882d1f6ef6d4d66a6b5426814e9adf7 SHA512 43739e2bbdb06168f7d2629b6deff4b7eb530e8ff7b14fc8bf701ececc187ccceac215ed1cb78d9a8c849085415f58fdd7a4b65ccdb5c8cdbba35a2dc674361c WHIRLPOOL b34b1db897d328f87288e359e05af7a59ee9feea6b2d5bc43840e22867e4cee296b2049a8ef1fa5fead9ee39606021a1163e681c2240550249065a3e9456e560
 DIST hplip-3.12.9.tar.gz 21314003 SHA256 e7361b9d6e968ce3306dc438e622a4412156e7c2d71b2a6face5952cf52e23c4 SHA512 bf0f498d7516c4b7653799c043dd6336a620be31680e1419bf09f9fd52492fc92f59e030df5110f89615c16d27ecad0169c83c938651a7fa7257057ccf5d30eb WHIRLPOOL 1059cf4216b60752c4f6da299f2dd86bdb26be7171275107280953225a9d1d729b135ba0f7990a8ed757fd52880612718bd846abb68ecbf61652923db88ca425
-EBUILD hplip-3.11.10.ebuild 7632 SHA256 564a6f920494bc5be3154e488212d8b3cf65b3541415f3998bca16ec838e0a1e SHA512 d3e2044e506a89ab31c847bd5f5b7b6c306c221e1b5dde88a8a860092dff81038716829da6c881a42bb3d5e2b5acb6add16eace7d8970fe5e7fd6dc89b2720d0 WHIRLPOOL cca2400af07091e43c4792ddd58e7019fdcd243fe0df0c5726d9a6d6d68096251a2594492953c3644e7103f0cf3a68aa541fd8cb37a2a5e1d6de677aad55525e
-EBUILD hplip-3.12.4.ebuild 6539 SHA256 d5e1808bb0f3a57277c718c3485f47ebfc4f3aae5209189203e01003ba228b03 SHA512 31e2034113274afb15cb6f5090e99795a5eda98e02be8040a655c7737572b471115630bd53859cf9209875bad63bcf760c0992e3f02507c01048e738194926ab WHIRLPOOL 32a207ccd041cd3ae80dc05db9736de7ead7e381a807c93b8c438397a830d8d52ee768324f2d37e780362a7c0db1adada5873f4c0373c7820dea85d30c582373
-EBUILD hplip-3.12.6-r1.ebuild 6861 SHA256 92167e80dfaf8ae40023e4e949c068f575cf499cde3c1f154a2da42179f00b9a SHA512 e233b513676bbeea26b829d191871ddc656ecc0a91377cd95af6753b7485b55a9bca8b4ee59503841b0bbf0e74cbc67bab7eec4024ec6f038d0320d196653b4c WHIRLPOOL 2170b1f89110f8fef97ead5f274c92bf5369838e6f0eb2a6e411008068a9c6b7f3ada3ce745da80edb16c28da87dfe7a3681f48d9d0e6a2458356633138375b9
-EBUILD hplip-3.12.9.ebuild 6858 SHA256 01a006512b39e099a234a6f7d0fe0c6432f850b110600694b76b179ec5bd41cf SHA512 27baf10970c77b5307c58e45c3207aa0c0f85743ea040cd2cb8b8fae1b258e9c695155e786e5c890a61ed689611d0daa5ef7960bd791d04cfb7d24344e88bdd8 WHIRLPOOL 1cb29ae63f6dfc2d92112d1fac95cefe5cedf18cb43872e04fa773b4a74eaba8e6cd87f11528fb44db4a71a2d6f82ac739efc27b35b1a600c0f02aa33bd62e43
-MISC ChangeLog 40974 SHA256 2fa5ad8470d63d373904522799e88f0df32d72f391bdd1ce30cf6e7c3ea425c4 SHA512 eb3f74cc85b607bc340d178131f5e3b56094b106a346c272b57010f3bc315093f2bcfe27791cb8e2d2affe4028932bc998c772222e6e6df1d808880a7417fbaf WHIRLPOOL eb012e63210e8919fdd3d8377aa3ee1cf6677b6d992984555f2a5b748f44a58aa94697e691d097038e7de0e6cbaee37bbdfd5a31513e94668fd1a76457f7d84a
+EBUILD hplip-3.11.10.ebuild 7512 SHA256 9968a0bdd0c83f7c7b89baa36dbb3d4d0b5455ca04a3af60e43b8f2070569508 SHA512 a706992d67f47de06912cb34c6ceedca2a561842a7ea2a511e29f11e36f86c1ceb5ddafb181eea648d688b83fdf197c1d7d8e01a73de56bc8d9bafdade0afcd6 WHIRLPOOL 865c37d29d7e20f7cca00d3f41725ec3868aee9068f3136426e7906e0294bfaa2aeef4f5d9157c4576ffdfe3098342019ec0e9ac5a3b9be844b1547a290f8f9f
+EBUILD hplip-3.12.4.ebuild 6419 SHA256 ca2de34f09f990df2af5d7ac9a0e24c7a6368eaf65400bdb35da0d7742095f85 SHA512 032d6368162c66a971e892d53429ad36f7e605ab5103a0aa57bf563661f909fda80a16c8651c489211b74df3caa218eadc682e3d0e4dd2b733aaaf606edd2229 WHIRLPOOL cc71a7703c7838dde94346c0a255999a3e5f478db634056a7a56f7512488a089356d047bf3f09c5ba891bf596bc14a2ec67f18808b0bfdb24225963e293e31c5
+EBUILD hplip-3.12.6-r1.ebuild 6602 SHA256 4f29bc530e0fa36d4927644661f997e5244252908e236a36fbbf68de5b9c7dec SHA512 28b89b62d730beeced98c5f484ae5b7beaa7f83c02be6e15f1cf7446aaf926002e75b5eed6282c48fd7c7802ccb77663a139b6e9c2e244ddf0013f3bda01977e WHIRLPOOL 3bd89a2dbeee05a6d38cf40919607dedb85038959ffd5ec94abb959cbc52ef18647f2e661afee7bf89c7c1afa559d0161f084055b5678a026d51e841ab59e4d9
+EBUILD hplip-3.12.9.ebuild 6599 SHA256 4f6779724874d0ceada96ac2dde9e901d2c311d8575a620027c5d404c0e62a4c SHA512 8edba07431f0c40476ab7e1dd929840a1f0e6c6d7052cac586f230ebb31461625976e5f3c77c10565426ad5505a03b59635e61b0552ddff699a09682fb6cfa53 WHIRLPOOL c97c9435b8f7a07ab57ff17e9c4808b0ecf8f2f5a8d6b94c7f887972f910a96d35f4212025cd8c2670875dc676a0bf118b2384b16def188055ed75cd09fc517c
+MISC ChangeLog 41220 SHA256 e9629ffff24d524220592dec03330131874153b608f9c40c6734ae0a93671223 SHA512 33bf3f9a2d939564a7c73a5a49345512e97364ce6ee2e0c148462d312d58a9cf350faef2ea26e92383e9340aa98f9f565f635cc5462dc6a908c2918629352cfd WHIRLPOOL 3690f2cd249e69af0164f3c754ffcbd8dc81af9c1b67a0abff0a7d95999c2c6b2b4267c8d25a590a73c016188c546901dd600d59125a3a00f727f8c9d2f7f13a
 MISC metadata.xml 1711 SHA256 7859a09f81f31df3e3b1bc2281f69936856ea8b81f381bea85d84d77f389ccc4 SHA512 ee7c3bb53561df1b81738e8a8b2f8beb8fad570bc4db910e72054b4115d1bd7797569d692a3b4b28a076e9797290c1b501ddb4a37ebded914f0093d61b6a1c8c WHIRLPOOL 63c67c317f97f7ca3c3d1450733765551adae4bfc4b4c3ff342de695953e5bbc9cda53235c2b0e3a489d29cd8734685500989076489708fdaa0529a94de8c5aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBV/mYACgkQlcuUeyFa0U2wkQCg52s8YFNF23TS5TgFGYsyYMRs
-DBQAoIP0C7vPe1MIEDArXkMsG3zt+tuX
-=mR+S
+iEYEAREIAAYFAlBYuSkACgkQlcuUeyFa0U3YEQCfXWpFjrsMj1aHiOczCgL1hMnB
+2TEAoJKZdmMXd0+nP/wY03ybvY5BR4H8
+=rlbY
 -----END PGP SIGNATURE-----
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] <sys-fs/udev-171-r5[extras] ) )
 	snmp? (
 		net-analyzer/net-snmp
 		dev-libs/openssl
@@ -221,6 +220,7 @@ src_configure() {
 		--disable-lite-build \
 		--disable-foomatic-rip-hplip-install \
 		--disable-shadow-build \
+		--disable-udev-acl-rules \
 		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
 		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
 		--with-docdir=/usr/share/doc/${PF} \
@@ -233,8 +233,7 @@ src_configure() {
 		$(use_enable fax fax-build) \
 		$(use_enable parport pp-build) \
 		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable acl udev-acl-rules)
+		$(use_enable snmp network-build)
 }
 
 src_install() {
diff --git a/net-print/hplip/hplip-3.12.4.ebuild b/net-print/hplip/hplip-3.12.4.ebuild
index 0dc40aff82c8..abf798230d2e 100644
--- a/net-print/hplip/hplip-3.12.4.ebuild
+++ b/net-print/hplip/hplip-3.12.4.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.4.ebuild,v 1.8 2012/05/21 17:27:50 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v 1.9 2012/09/18 18:10:42 billie Exp $
 
 EAPI=4
 
@@ -21,12 +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"
 
 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] <sys-fs/udev-171-r5[extras] ) )
 	!minimal? (
 		>=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] <sys-fs/udev-171[extras] ) )
 	!minimal? (
 		>=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] <sys-fs/udev-171[extras] ) )
 	!minimal? (
 		>=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)