move CONFIG_CHECK variable into pkg_setup, thanks to anarchy@gentoo.org.

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

4 files changed, 27 insertions, 19 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 8c1ab785b4b9..b7493d6f2860 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.649 2012/03/11 01:44:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.650 2012/03/11 23:38:27 williamh Exp $
+
+  11 Mar 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  move CONFIG_CHECK variable into pkg_setup, thanks to anarchy@gentoo.org.
 
   11 Mar 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c701cd1277ab..9477e9517496 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -130,15 +130,15 @@ EBUILD udev-149.ebuild 16424 RMD160 463967bffcfe474491b5282bf77b8aef249f9b43 SHA
 EBUILD udev-151-r4.ebuild 16663 RMD160 a86faa791d5ecf2d84b53881abae8db6507bd302 SHA1 1d3a1a2a21e70ef33c1c5d9288bbe02c77abf04a SHA256 953c62eda14481446518c51eb7fb7fbb8dc0fe5a2c335c72aee833f12cb0adaf
 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 9881 RMD160 bd16293a3e2b385ba58b03f51aa62743b3aae5cb SHA1 a3278125a41ccdd48426820025fddbe07c21d3ae SHA256 707efeba6f0fa04a1263b4c496ed98589f67de79e38337f7b5fb51ac08380ef5
-EBUILD udev-9999.ebuild 9766 RMD160 1a4cf80c9a9b7b3a7075ab09c5c20ea1d6896b79 SHA1 e05c8c15e791ac4648fd51f03826f58f14ad9342 SHA256 d4f5729999c2b8358a0403ee471c9e276aaff8658d0e87a5e5903b9cd0696734
-MISC ChangeLog 25127 RMD160 5590822b32b9ab5b1e97ae26e41c9b661cf3715f SHA1 eadf470e66a19ae6c8a481849b6ce04e573ed90a SHA256 21202c707fcddfd92d084bcbd73ecea883fc7f51132376544505c7a93434bba1
+EBUILD udev-181.ebuild 9929 RMD160 368eff0df891f5982a4cad30104e04cf6eaef770 SHA1 6847ea798beaf940434b8cdbe9057f5e1597dd21 SHA256 603c02812c44478d0764a9e701d66e30a383b5db35a4ee4ba9d57cce8e23ab17
+EBUILD udev-9999.ebuild 9753 RMD160 d8e16db720d7646f369da06a9ea97763f9f0f7e4 SHA1 de552571b61526224163ddc41cb22c01727c7f4d SHA256 3124ada98b305c87bcaa6d55d1165bb545df5b02ed28dd14b087ee010f612902
+MISC ChangeLog 25291 RMD160 792028a1a10de96de72570f823c4f82daff3eac8 SHA1 b444fac1570811585cede28c3d219da777f0a7b8 SHA256 4cbf39ab9aef82673199b36b894d99663f23ae19f41ac90756ae1400c65d4410
 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.17 (GNU/Linux)
 
-iEYEARECAAYFAk9cA3sACgkQblQW9DDEZTirYACfeADIku3fZNOHVSAvYndwumJF
-PI8Ani+tcGvdTIyk9VotLgG6tXF7+v5L
-=h2IU
+iEYEARECAAYFAk9dN34ACgkQblQW9DDEZTi2qwCggWaAHLJquo7ejZtMCR1/Ni7W
+bnYAmwY2iHBu3LoAR1yis6+wR05d3feP
+=/WZC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-181.ebuild b/sys-fs/udev/udev-181.ebuild
index da47d0cceeee..1e1de6de283d 100644
--- a/sys-fs/udev/udev-181.ebuild
+++ b/sys-fs/udev/udev-181.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-181.ebuild,v 1.3 2012/03/11 01:44:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-181.ebuild,v 1.4 2012/03/11 23:38:27 williamh Exp $
 
 EAPI=4
 
@@ -70,11 +70,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-kernel/dracut-017-r1
 	!<sys-kernel/genkernel-3.4.25"
 
-# required kernel options
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~HOTPLUG ~INOTIFY_USER ~NET ~PROC_FS
-	~SIGNALFD ~SYSFS ~TMPFS_POSIX_ACL
-	~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
-
 udev_check_KV()
 {
 	if kernel_is lt ${KV_min//./ }
@@ -86,6 +81,15 @@ udev_check_KV()
 
 pkg_setup()
 {
+	# required kernel options
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~HOTPLUG ~INOTIFY_USER ~NET ~PROC_FS
+		~SIGNALFD ~SYSFS
+		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+
+	if use acl; then
+		CONFIG_CHECK += " ~TMPFS_POSIX_ACL"
+	fi
+
 	linux-info_pkg_setup
 
 	# always print kernel version requirements
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 7d9c8d7c2491..2e3e49c50a45 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.73 2012/03/11 01:44:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.74 2012/03/11 23:38:27 williamh Exp $
 
 EAPI=4
 
@@ -68,11 +68,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-kernel/dracut-017-r1
 	!<sys-kernel/genkernel-3.4.25"
 
-# required kernel options
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~HOTPLUG ~INOTIFY_USER ~NET ~PROC_FS
-	~SIGNALFD ~SYSFS ~TMPFS_POSIX_ACL
-	~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
-
 udev_check_KV()
 {
 	if kernel_is lt ${KV_min//./ }
@@ -84,6 +79,11 @@ udev_check_KV()
 
 pkg_setup()
 {
+	# required kernel options
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~HOTPLUG ~INOTIFY_USER ~NET ~PROC_FS
+		~SIGNALFD ~SYSFS
+		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+
 	linux-info_pkg_setup
 
 	# always print kernel version requirements