QA Fixes: use should not be called in global scope and clean up the

conditional declarations for IUSE and RESTRICT.
Thanks to mr_bones_ for pointing these out.

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

4 files changed, 25 insertions, 27 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9d4670ed5b7c..e75a8e4835cf 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # 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.612 2011/11/08 16:49:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.613 2011/11/09 04:15:20 williamh Exp $
+
+  09 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
+  udev-9999.ebuild:
+  QA Fixes: use should not be called in global scope and clean up the
+  conditional declarations for IUSE and RESTRICT.
+  Thanks to mr_bones_ for pointing these out.
 
   08 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 986736c08d88..eb7a8ab95691 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -130,14 +130,14 @@ EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842
 EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 SHA1 cb4060adb3235d261f027be37e56272ac8f4755b SHA256 3f1b289c9c9c2d6ee6cd63b8db530240dcc9532dbc3ff273c052679b3062724b
 EBUILD udev-171-r1.ebuild 15984 RMD160 2f687585ae93014dbeaaa61e440e0f708ecd2b04 SHA1 92b4eee4956b24677d9e8251b29c40c300cf059c SHA256 9cf4a54cc9e34bf48c5299142a625d056869fbabcd683a233053e6fd04305218
 EBUILD udev-171-r2.ebuild 16413 RMD160 4b7e26ba462c959329d60488aa7f76efb0986297 SHA1 866171a1074b32653aafbd77bb2516c0b444a202 SHA256 3ee60a02912e42a16663be50adec46ec5ee8f26f10eb88609378e7272a05c376
-EBUILD udev-175.ebuild 11917 RMD160 fc7caee83a2c7b58e5bf8ca09d07470d504c58f0 SHA1 0ca3b228699f98b929e4591dc9dbaca280036942 SHA256 12f2463550d9bf6436e0f10e14fbb63238006920507484e577ade5f856fee925
-EBUILD udev-9999.ebuild 11921 RMD160 5c0c4ea384981e8fd6a8a2857c43215eea93c111 SHA1 52e6e313cb79310da1c4bf0cfdb6cd6747b82df8 SHA256 ebec98d5b4c59f685c6dd8a1438f2a2cc3f4de2defe31de7b3c9f8cce67c3619
-MISC ChangeLog 125249 RMD160 2afc1a310d09aff3291afdc6ad1cb0d0dddfdff7 SHA1 34c7679e58fe3d218637c58220d2a4542dc99922 SHA256 cab37147d18777eff8d8209ee640a42475b3571c30dad53a0a4bae91e8075b4e
+EBUILD udev-175.ebuild 11835 RMD160 92923573d28ff60c16c7a61f26487698418df45b SHA1 037999dbfbf8d0f76811c404a1bbfd402ba8b150 SHA256 608d62529e93991a1db66f0477ae304a59dc9dfe60b2369da8d1df99ff2ed7e3
+EBUILD udev-9999.ebuild 11839 RMD160 26ae9b3c43c15a6ba26825146cff89e082570c31 SHA1 52f2a6845319ab135501278131b6ba1a98441ca5 SHA256 7d971727e4745d81583174b8c5779d8adae360e48640a8a80e015e1bc18937b5
+MISC ChangeLog 125504 RMD160 9484866f2b4c19279befd9269a7c0c777f57bcfb SHA1 03c5d5893fa8b60129980d2c9e3b716606e04ab4 SHA256 e41b1f642d376ae94bffdc224e9e167bfe24db058bd1bde853847f35113de4ae
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk65X0EACgkQblQW9DDEZTiTMwCfWgdyJ+WdrqUnbatrcWIbMizR
-48wAoK5IXpi98AAQwrvE8PeGWDe7qBez
-=GHoa
+iEYEARECAAYFAk65/mcACgkQblQW9DDEZTiiJACcCKLHt9GacSsp6VEeRejiUgkO
+J8sAmwWtEiUomCXre91OPrE2tFLVy/Kl
+=qL9v
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-175.ebuild b/sys-fs/udev/udev-175.ebuild
index 9287b781a92d..718abada014e 100644
--- a/sys-fs/udev/udev-175.ebuild
+++ b/sys-fs/udev/udev-175.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-175.ebuild,v 1.2 2011/11/08 16:49:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175.ebuild,v 1.3 2011/11/09 04:15:20 williamh Exp $
 
 EAPI=4
 
@@ -35,9 +35,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
 	keymap floppy edd doc"
-[[ ${PV} == "9999" ]] && IUSE="${IUSE} test"
-
-RESTRICT="test? ( userpriv )"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl dev-libs/glib:2 )
@@ -54,15 +51,14 @@ DEPEND="${COMMON_DEPEND}
 
 if [[ $PV == "9999" ]]
 then
+	RESTRICT="test? ( userpriv )"
+	IUSE="${IUSE} test"
 	DEPEND="${DEPEND}
+		dev-util/gtk-doc
 		test? ( app-text/tree )"
-fi
-
-if [[ ${PV} == "9999" ]] || use doc
-then
-	# for documentation processing with xsltproc
+	else
 	DEPEND="${DEPEND}
-		dev-util/gtk-doc"
+	doc? ( dev-util/gtk-doc )"
 fi
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 1cd000fcb7c9..bb75eab5a3ec 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.58 2011/11/08 16:49:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.59 2011/11/09 04:15:20 williamh Exp $
 
 EAPI=4
 
@@ -35,9 +35,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
 	keymap floppy edd doc"
-[[ ${PV} == "9999" ]] && IUSE="${IUSE} test"
-
-RESTRICT="test? ( userpriv )"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl dev-libs/glib:2 )
@@ -54,15 +51,14 @@ DEPEND="${COMMON_DEPEND}
 
 if [[ $PV == "9999" ]]
 then
+	RESTRICT="test? ( userpriv )"
+	IUSE="${IUSE} test"
 	DEPEND="${DEPEND}
+		dev-util/gtk-doc
 		test? ( app-text/tree )"
-fi
-
-if [[ ${PV} == "9999" ]] || use doc
-then
-	# for documentation processing with xsltproc
+	else
 	DEPEND="${DEPEND}
-		dev-util/gtk-doc"
+	doc? ( dev-util/gtk-doc )"
 fi
 
 RDEPEND="${COMMON_DEPEND}