Control udev dep with USE=udev #417767 by Alexey Shvetsov.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 31 insertions, 25 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 1608934b8a19..710b7718f26e 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.386 2012/05/25 16:15:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.387 2012/06/02 18:55:37 vapier Exp $
+
+  02 Jun 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.21.2.ebuild,
+  util-linux-9999.ebuild:
+  Control udev dep with USE=udev #417767 by Alexey Shvetsov.
 
 *util-linux-2.21.2 (25 May 2012)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 8a92cc41412e..d9626fc2e90f 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -26,25 +26,25 @@ EBUILD util-linux-2.20.1-r1.ebuild 3647 RMD160 1cad4312261012610d6908280d37cabb0
 EBUILD util-linux-2.20.1-r2.ebuild 3778 RMD160 6f3b24c0a210cddb4c40a778ab374e63c27779b6 SHA1 96474edde650d19b3269cdb3596f8bbefd855c93 SHA256 8baa68e21b4ec490c67f782d60c19a7e91a7a4118cb3d3fb533db32c04071b57
 EBUILD util-linux-2.20.1.ebuild 3577 RMD160 c76d0976b9acefb5760cd8330e5a21c582b6743f SHA1 c2aceed742391b64cb93458dea45a2ec94e7a09f SHA256 28469f50dc9b46fe2731a754d6f0f093eb5899bd08d8a77c0fb7a980ef2377bf
 EBUILD util-linux-2.21.1.ebuild 3554 RMD160 4209678e82f723e9d8f8aca8200e67b7a5ffc518 SHA1 3088f2bb8d36793e734a8a5d78586eda5cb3a65b SHA256 0c8bfb3d96c931d75d6334b628a494ceff213e1a5c2bb0776d281a7151ce18a1
-EBUILD util-linux-2.21.2.ebuild 3514 RMD160 aa612d9188119396cd63ff7367097ece20c0c8af SHA1 6cff5679875dc37a9c981eb1db4c47157e6020d2 SHA256 6c0816827f8c3a605999209f57f40bca0c80967d9b210b391aa9bfb6a1991265
+EBUILD util-linux-2.21.2.ebuild 3543 RMD160 1e690b097e81dfb2508d4eb3fdc69b54fca24d3a SHA1 f7d43cc794207faed9c4ae7f1f65b7de1edcd339 SHA256 0771cb8fc4eac0cd685fae0cb471c521d62e1e65e5d015f66c4972bbb97e2116
 EBUILD util-linux-2.21.ebuild 3624 RMD160 831a86c7a6ebfa911ebf6b802f6c9fb36e3ece00 SHA1 c3f2ca9bb654fc3d0625d4e57ae5a623a4e27854 SHA256 3a037c6f463a83352cc4582b997141ba48d584fc1f640ec6e2a7f9d0c06acb19
-EBUILD util-linux-9999.ebuild 3356 RMD160 faa3e55b62e84ad0111dde729c566167e850e78b SHA1 309af3510ab1d0dba3159eeea16b74318c045067 SHA256 e5bbb2a53a5ce26d0b51c58b590aaf661731d9a104e9aa0ab32d760213fd2bd4
-MISC ChangeLog 59870 RMD160 7eed8437762490646c82365897e2fe4fed178085 SHA1 212dabdb32074b2b840d090d477c6ffa48fb3f5f SHA256 7630c82cff393be2ba016b35097be66743f0362d2f62cae064b05ba72d9e1691
+EBUILD util-linux-9999.ebuild 3385 RMD160 8605ae070d321e9781dc2ded7ab976ba3f0e33c3 SHA1 f463615de25fed550907fa2e5cdf76da851c08b6 SHA256 ac94857adbcf1937b4354777ffab2dc0f4265c30d754b6e234d418418b2b7a5f
+MISC ChangeLog 60034 RMD160 cdea439100bd40e65eb061c881a07e9ba9700487 SHA1 6a0b5ee67f5402b5a24bd3fca54e35f08756c5b3 SHA256 07914bb4e2e6fc339367c4c6c98b33296106685f1007916afd5dd2b8319edf5b
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPv7BzAAoJELEHsLL7fEFW7dMQALeIVVpmha06kOn1C4nz3pAS
-TBuBHJoRnmkJhlstzB0ssCwW8XxfC+9zQ/DGV8g6MriK0BXvvPCBQq9VsSz74bzx
-EHJwehpPtcoiRzzv2rBTWLOm6MDPaXnXk0Y0DLNaRVOpW90mrDehgp8HK+3SaZab
-XcoHCthAjqIEprC7P1Mo0lk70PvFOJ7yB2W9GTkoWI0Hh0YxotQZ4dd6Nbb8i22w
-INyZEY+uYNoUIh5pkofG9lIc978FS7coaDFXLUeNzpyANpgFd1zhJ6VWh6SWRcL7
-YZjbba1zc5Y0PtrbkmYx1QcJWEcIX235TAWpMZBjLtd5PSwO4IuSSQPqOPwJFCgF
-i6Zw+S5IRB1HnstolCKlRsyzUcfIQzPB64WWKm2R95aqQb53nW+VoMZ4/xssPjAk
-evs1/k4cn/HWi20rhgRjAPyf04riSALV4VzQfbD/RmzTwcS1DfP5BvQOTQe7ttgl
-VC+RZMNazdpPoSm95OGrSzLcPjRPTTcXYApitaxUhF01uJuhnVHM77XeFb+SCEWU
-W7ceP0sOqSW+eg54Dg4MsYmaghIft+QjnEjfBKE+hje0iO0otLAPmZfejJ0IMkxp
-CpQ/n7gmM77F7H1QvZxDFGBQ9FGcsXi+sfJIPOH1vQGyFuvJ9q3S+OanZr4Kq0LY
-pqYpe2oi6A/l04jlUcB5
-=lvPg
+iQIcBAEBAgAGBQJPymGwAAoJELEHsLL7fEFWoxwP/jESR5Nzrh5ZdO3KZtaAZDwi
+/krIsJ+YDWMhzPEIscj5J7ow8Kuy5++NYCVzEXkZo2PpS5aA99XOnmaL9D+S1Ns+
+lMwsR6lWx6aaKmobb/OhLWSO9gre4Ig7cfWs5UEMvy9d3SJf5ayDD7eZkRzdpWWX
+vpHrH1ZBOn1eSr38cWjlqlaBVLXjmq5F1bySqOJOelw1zyBPKCm30YwtFkaDM1L4
+a64ryxH/t3fftFPJYkxiyBXcBCyN6e0x2Ynb7jxGmoOaP9iTqJ7R3iHheJoOglRR
+shq3rBg9pjLG8p0EXvKTwvCBCzzsHN5loGGJwHw5ISptrJR96rT+PrvGN6x/9tih
+ouzUC+a3BBTCsO8g8aLwnWagSFshVUHXb9cg9zZH8b9zXRdYACScpg2tkkuhov11
+9zwHjH/hcGfXHpemke0I376F4R1qEfyHHoz9P1z5xi7EkNMWeRwv3QaJA2Yg3o0H
+JMALdrOlE6ggqMvO9Rh4D60d95xUPwnnBtATqdtiL+2h9V/Vd/xJUOA6IPRG9dF3
+L1hUQf/hn+WZ0jw9hKU6U91+JDjOD15dN27f9CCg6dsDv0DD015sbRBdYGqVbpBQ
+whg5q9YMqooP+IJBi1kPQtuUyCS0akbH8bnFGK0AXFFX/V+cezNB46lDTmjFmlbS
+W99LFHTZP3megUMAe5oh
+=h9iP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.21.2.ebuild b/sys-apps/util-linux/util-linux-2.21.2.ebuild
index 3dd62fb9a440..24380ed9910d 100644
--- a/sys-apps/util-linux/util-linux-2.21.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.21.2.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-apps/util-linux/util-linux-2.21.2.ebuild,v 1.1 2012/05/25 16:15:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.2.ebuild,v 1.2 2012/06/02 18:55:37 vapier Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs uclibc unicode"
+IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs uclibc udev unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -40,7 +40,8 @@ RDEPEND="!sys-process/schedutils
 	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
 	perl? ( dev-lang/perl )
 	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
+	slang? ( sys-libs/slang )
+	udev? ( sys-fs/udev )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/os-headers
@@ -49,7 +50,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		po/update-potfiles
-		autopoint --force
 		eautoreconf
 	else
 		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
@@ -98,6 +98,7 @@ src_configure() {
 		$(use_with selinux) \
 		$(use_with slang) \
 		$(use_enable static-libs static) \
+		$(use_with udev) \
 		$(tc-has-tls || echo --disable-tls)
 }
 
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d1461bf67e42..e5bdc59ef97c 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-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-apps/util-linux/util-linux-9999.ebuild,v 1.32 2012/05/24 02:52:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.33 2012/06/02 18:55:37 vapier Exp $
 
 EAPI="3"
 
@@ -28,7 +28,7 @@ fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs unicode"
+IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs udev unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -40,7 +40,8 @@ RDEPEND="!sys-process/schedutils
 	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
 	perl? ( dev-lang/perl )
 	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
+	slang? ( sys-libs/slang )
+	udev? ( sys-fs/udev )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/os-headers"
@@ -48,7 +49,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		po/update-potfiles
-		autopoint --force
 		eautoreconf
 	else
 		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
@@ -93,6 +93,7 @@ src_configure() {
 		$(use_with selinux) \
 		$(use_with slang) \
 		$(use_enable static-libs static) \
+		$(use_with udev) \
 		$(tc-has-tls || echo --disable-tls)
 }