live ebuild updates: remove acl support and remove support for arch-specific rules since they have been removed upstream.

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

3 files changed, 18 insertions, 25 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 66d48ad9114c..077eb4e1aa7f 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.647 2012/02/25 15:21:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.648 2012/03/08 17:14:27 williamh Exp $
+
+  08 Mar 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  live ebuild updates: remove acl support and remove support for arch-specific
+  rules since they have been removed upstream.
 
   25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild:
   ppc64 stable wrt #399717
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 8e2f4e924b33..c1f02dfc9f70 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -131,18 +131,14 @@ EBUILD udev-151-r4.ebuild 16663 RMD160 a86faa791d5ecf2d84b53881abae8db6507bd302
 EBUILD udev-164-r2.ebuild 15102 RMD160 7ed8900771e83abbd3f2a14dd880d5c7462310f2 SHA1 2533fed6842fc8b3708bcf1ca541a4f13508cb1f SHA256 cca3497d3e06df3da7cc387543f3dc367782755cb504855e50e7900ae99e6b35
 EBUILD udev-171-r5.ebuild 15556 RMD160 c45b51cc75bd9a29bff3208b1287a957fc3d46f1 SHA1 162f19412aa499a8f255b82369ce33e7397eb4c1 SHA256 9a4d2d8dd9e0687371064ca120fd4f0529b765b025421cd5654bd0b40c4fb273
 EBUILD udev-181.ebuild 9797 RMD160 e3b74cf9e16c19d7adfdf75881972dc36c035fac SHA1 a9baebe8ae475988a8024e1f4aebe0eb105f4df5 SHA256 03a9f4bb7b628b656c23ab1d4fa4470e242162ef8c9e738dfabbf4418ec55eaa
-EBUILD udev-9999.ebuild 9841 RMD160 5eb45a6bdc0ca007c4c26cf90074a54b7b1a6b4a SHA1 2a91f02697eb0d0c41eb45801a5aca5a550afed3 SHA256 2471a6bf47cdd823a4a1c543bdab211bf7089b6e6e844100931605a8d3ffa7a3
-MISC ChangeLog 24754 RMD160 97fa3bd8b66302ce6e0cd0c149e6472510e0b75f SHA1 2aa4458ae4f9548717c117c024c61c09e33699a0 SHA256 8e697c5a3d832a55037f8c03b67c59b0f4acfff7c1de6603e1ede69be9deb745
+EBUILD udev-9999.ebuild 9682 RMD160 8977e7b43e81907e02e0421b7cee579a036eb797 SHA1 3998c5ab1533cf34cf6b8a7ba37b659162bc9bef SHA256 9f80fd38dc8422c7fb0693b46c1f134bdd3136716f0d43d30513d89e00c1a571
+MISC ChangeLog 24949 RMD160 a561217e2e21b39b6bd3bf1cbbef11af38b7fe19 SHA1 c2c3821c6ea46c10cdcf09e52e2a28639b1be665 SHA256 8eebce6cbe6beb590abdadc0a0f1d3bed4ab35286c2b2224d542e88944161d0d
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPSPxeAAoJEEdUh39IaPFN9VUH/0z8HDe8rnjaSY/emGJwMuJi
-75iUUDfigfIGLiGb0MSkokq3kTjvPh/KZXInu22fHJfVOuDxQfZtQz64c7cn99Mq
-815Rwo8c2q0Bo925QYq0x/cs+tnw/gH3P4mEFAWVpZWDFc5/r+Wc+pqqKYdFWf13
-Jb4Zl/7zXZd82avOJ/Js1h6bsk1kUMBuQRVr9/nAF0eZaEWQeNaTQRi7EkyNKFeS
-scmgzCGtacFE1iV68wj2KVD1oasJ/ocSnk4b1QMLfIYr1jQT1EOR8YFAetKVCHZn
-T7phS18JOSIQq1WjTHVfMTegqANmxdgKShDRNQR7MB1ZGsdH8tA5FlRxV10o40w=
-=yj7t
+iEYEARECAAYFAk9Y6Q0ACgkQblQW9DDEZThaNgCggtLp/OW4t/Vwz0R0PYjRE9gf
+vxkAoIhD8tQurenCWJOpBO6qKO3hj70n
+=YzMG
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 9c668a017cd7..3abcd263fff2 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.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/sys-fs/udev/udev-9999.ebuild,v 1.71 2012/02/19 07:21:53 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.72 2012/03/08 17:14:27 williamh Exp $
 
 EAPI=4
 
@@ -29,11 +29,10 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
+IUSE="build selinux debug +rule_generator hwdb gudev introspection
 	keymap floppy edd doc static-libs"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
-	acl? ( sys-apps/acl dev-libs/glib:2 )
 	gudev? ( dev-libs/glib:2 )
 	introspection? ( dev-libs/gobject-introspection )
 	>=sys-apps/kmod-5
@@ -60,7 +59,6 @@ fi
 
 RDEPEND="${COMMON_DEPEND}
 	hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
-	acl? ( sys-apps/coreutils[acl] )
 	sys-fs/udev-init-scripts
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
@@ -117,7 +115,7 @@ src_prepare()
 
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/{rules.d,arch}/*.rules \
+		-i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
 	if [ ! -e configure ]
@@ -153,7 +151,6 @@ 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 acl udev_acl) \
 		$(use_enable gudev) \
 		$(use_enable introspection) \
 		$(use_enable keymap) \
@@ -185,14 +182,6 @@ src_install()
 	# Now install rules
 	insinto /lib/udev/rules.d/
 
-	# support older kernels
-	doins rules/misc/30-kernel-compat.rules
-
-	# add arch specific rules
-	if [[ -f rules/arch/40-${ARCH}.rules ]]
-	then
-		doins "rules/arch/40-${ARCH}.rules"
-	fi
 }
 
 # 19 Nov 2008
@@ -356,6 +345,10 @@ pkg_postinst()
 		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
 	fi
 
+	ewarn
+	ewarn "The udev-acl functionality has been removed from udev."
+	ewarn "This functionality will appear in a future version of consolekit."
+
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"