Use acl global use flag instead of udev_acl.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux i686

5 files changed, 21 insertions, 17 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9629e1aae37a..0c4940ac55fb 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.581 2011/06/07 05:54:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.582 2011/06/07 06:05:21 williamh Exp $
+
+  07 Jun 2011; William Hubbs <williamh@gentoo.org> udev-171.ebuild,
+  udev-9999.ebuild, metadata.xml:
+  Use acl global use flag instead of udev_acl.
 
   07 Jun 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
   migrate live ebuild to eapi 4.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3c85439bc97d..a2fba53396b4 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -140,14 +140,14 @@ EBUILD udev-167.ebuild 15054 RMD160 098fbb53227f62b0eabcb006fb16e70d255eb266 SHA
 EBUILD udev-168-r1.ebuild 14838 RMD160 4169cfadee63cc52c6331c7ff8d953b1ca80d0a6 SHA1 27699dc9ad7b8dabf441b7a5fadc20983a2cd860 SHA256 cf65806f20aec1b90aed78eda39eec528202b558aa90970efba2717f43cc7667
 EBUILD udev-168-r2.ebuild 14742 RMD160 09b7eca6e071c5bd42fd00ddff9255243c79cf35 SHA1 2b4b46b2f9020aba5c2e49ff747b69450da4c20a SHA256 2a64f36a30acd8e0eebb9621a2858f072c50d0c4ecc0976d987a7c2685cc58f5
 EBUILD udev-168.ebuild 14722 RMD160 8a5c99759a07874699e16cab7cffb81d8e4028ea SHA1 ed70d00a842aae6dfd5d7f9e9c1386b879f2636f SHA256 3d814ce1bf3c975f92a87fda21f8f0daa372ec12ee0c7f8d7ac454e1b35fb4c5
-EBUILD udev-171.ebuild 15371 RMD160 fc4d634ed60479296ae73c66da991b2387e53d84 SHA1 76f746ba73a89bbc461248d58e2f993abe330d09 SHA256 90970aebbe2e1bcf310b326990973bd027350d5b49cf6ea0b79acfeb70180018
-EBUILD udev-9999.ebuild 14620 RMD160 4cbb113486f9dbbdc5107e2406bacaff4fe28889 SHA1 6f979bdb5c6fea464a92804f9bfb0ca44c7c773d SHA256 7276296ad181948ff4e12509fc6c78452c9313bcf0175d1013cf591891822719
-MISC ChangeLog 120373 RMD160 127c543321b40cbb0d34c5a9a6a3fc0b31da9753 SHA1 bacce5f0e75d28a21807201e50315b15691a42af SHA256 cc3764cd1bfc164f79ffdf75081c8649a45d6d5661b704a89a62c9e2c5f669b9
-MISC metadata.xml 1261 RMD160 7af6ef904f506127cf67ac9b5eb4d2c9260843bf SHA1 484ff932a3a6885bd694347099417e51ce8f30a4 SHA256 d20b2751c0e01cce6d071565e57594157ec63a7ae33ef7ef401903fad78311c3
+EBUILD udev-171.ebuild 15366 RMD160 f3d212ef79621ae7da80df3c31a74d3ae73e0bdd SHA1 04671d52760524e3445b8e3e4223f34ad76d7a15 SHA256 d13f26c77503d6714ee451ef22b9d8922eb7d62e093c08bf9dc8f3fd80e451b0
+EBUILD udev-9999.ebuild 14614 RMD160 998f205a4f1b8c6f7398893025417c5da7d631dc SHA1 8dc0480555857ccd9f5b0b03456596d8dfa3770d SHA256 8ebc6c6293cb36f60ffd2f85fe991e86cd44fe8425ccef5577731a064e260463
+MISC ChangeLog 120523 RMD160 186df5bd5e9aea1f825ba0dbf827b5d91ab3dc01 SHA1 9842075b9c21b6f351962dd25807bd13e305a0e7 SHA256 d6729bbeee5624c1a3b1ec543dfd54658cfdafcf9b00fe81b71cddc04d8789cc
+MISC metadata.xml 1256 RMD160 54b67bdde62c90a3eab48e8b5b97940eea887421 SHA1 093a8ec3a1dcd0da2c124373609ff007dc6fdb11 SHA256 cce07cae1a4a26b900f28186b6a81fc494887885410ed8e83e91e460c5306a0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3tvQ0ACgkQblQW9DDEZTh+UQCeM6huc9wd3B6nQ+LGOhFEDQah
-9QcAnjLEys+Z4MsXJ/268WSfMZr6pXi+
-=FtDv
+iEYEARECAAYFAk3tv8AACgkQblQW9DDEZTi6DQCfWm4EvNUjECC/3pOBBwl/zrEd
+vPQAoK5vrC9TUVyga+c00vIYxATTlTeL
+=PSG8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml
index 8df3cd8cc01f..aa5f0e5379b8 100644
--- a/sys-fs/udev/metadata.xml
+++ b/sys-fs/udev/metadata.xml
@@ -18,6 +18,6 @@
   <flag name="keymap">map custom hardware's multimedia keys</flag>
   <flag name="old-hd-rules">Install rules for /dev/hd* devices, removed upstream at udev-148</flag>
   <flag name="rule_generator">enable persistent network and optical device rule generator</flag>
-  <flag name="udev_acl">apply ACLs for users with local forground sessions</flag>
+  <flag name="acl">apply ACLs for users with local forground sessions</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-fs/udev/udev-171.ebuild b/sys-fs/udev/udev-171.ebuild
index a5868625c49b..62fd561dad13 100644
--- a/sys-fs/udev/udev-171.ebuild
+++ b/sys-fs/udev/udev-171.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/sys-fs/udev/udev-171.ebuild,v 1.2 2011/06/05 21:09:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171.ebuild,v 1.3 2011/06/07 06:05:21 williamh Exp $
 
 EAPI="1"
 
@@ -28,10 +28,10 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux test debug +rule_generator +hwdb +udev_acl +gudev introspection +keymap floppy edd action_modeswitch"
+IUSE="selinux test debug +rule_generator +hwdb +acl +gudev introspection +keymap floppy edd action_modeswitch"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
-	udev_acl? ( sys-apps/acl dev-libs/glib:2 )
+	acl? ( sys-apps/acl dev-libs/glib:2 )
 	gudev? ( dev-libs/glib:2 )
 	introspection? ( dev-libs/gobject-introspection )
 	action_modeswitch? ( virtual/libusb:0 )
@@ -196,7 +196,7 @@ src_compile() {
 		$(use_enable hwdb) \
 		--with-pci-ids-path=/usr/share/misc/pci.ids \
 		--with-usb-ids-path=/usr/share/misc/usb.ids \
-		$(use_enable udev_acl) \
+		$(use_enable acl udev_acl) \
 		$(use_enable gudev) \
 		$(use_enable introspection) \
 		$(use_enable keymap) \
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index a874a9410149..ef260a2caabc 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.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/sys-fs/udev/udev-9999.ebuild,v 1.41 2011/06/07 05:54:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.42 2011/06/07 06:05:21 williamh Exp $
 
 EAPI=4
 
@@ -37,10 +37,10 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="selinux test debug +rule_generator +hwdb +udev_acl +gudev introspection +keymap floppy edd action_modeswitch"
+IUSE="selinux test debug +rule_generator +hwdb +acl +gudev introspection +keymap floppy edd action_modeswitch"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
-	udev_acl? ( sys-apps/acl dev-libs/glib:2 )
+	acl? ( sys-apps/acl dev-libs/glib:2 )
 	gudev? ( dev-libs/glib:2 )
 	introspection? ( dev-libs/gobject-introspection )
 	action_modeswitch? ( virtual/libusb:0 )
@@ -189,7 +189,7 @@ src_configure() {
 		$(use_enable hwdb) \
 		--with-pci-ids-path=/usr/share/misc/pci.ids \
 		--with-usb-ids-path=/usr/share/misc/usb.ids \
-		$(use_enable udev_acl) \
+		$(use_enable acl udev_acl) \
 		$(use_enable gudev) \
 		$(use_enable introspection) \
 		$(use_enable keymap) \