Use subslots/USE deps for ncurses/udev #555706 by Steven Johnson.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 27 insertions, 24 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 4b8975b6d3e5..30b9a80d60c0 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.508 2015/05/30 11:43:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.509 2015/08/04 05:49:32 vapier Exp $
+
+  04 Aug 2015; Mike Frysinger <vapier@gentoo.org> util-linux-2.26.2.ebuild,
+  util-linux-9999.ebuild:
+  Use subslots/USE deps for ncurses/udev #555706 by Steven Johnson.
 
   30 May 2015; Mike Frysinger <vapier@gentoo.org> util-linux-2.25.2-r2.ebuild,
   util-linux-2.26.2.ebuild, util-linux-9999.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 8f585b6d5bcc..dff5be83f35e 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -26,25 +26,25 @@ EBUILD util-linux-2.25.2-r2.ebuild 5724 SHA256 7722ef2aa2cabb5a6acbe9daf84d21a05
 EBUILD util-linux-2.25.2.ebuild 5191 SHA256 da5a1563f5b2a0b025d5615b56052d131e592805c46635a0cb163c3966df7eeb SHA512 f255faf393126f31e8c3a5f5766c3af684c5a038287d40a599beb2f1acdbede6972fc2697fc7a7ce2ecd42822b470c8d3573040df42f92d511098936958d6ac3 WHIRLPOOL 620fcc53b9a434f069489868ebcde9b9cd6531b840d76392112f4f8e7daef7ae3fddcbf63ee4ba90442536a7a227e9faa366ec76539febdff1618346ce12f609
 EBUILD util-linux-2.26.1-r1.ebuild 5461 SHA256 30c217ee4d90a2ad8c4f611b2d49198aa51d85782bbe83a0f128450c4478f444 SHA512 2bdb64ce71f6cda9f3187c6e22e0a63643b94d6f63f3a9e938819a3c9f4c72261abe1ee3ed9cade0f8f1f2c939c3740f501ca07e6191cd0869bcfbd907d2c291 WHIRLPOOL 28011e28bd98d11299fe8b520d6387129980ab6fac9d53722ad190bffde2b0e1e660ef9d166145fefb1f9ebb4b71280522fe64fe600c01be5a64bd6f46478441
 EBUILD util-linux-2.26.1.ebuild 5381 SHA256 5225ed00df67e3d2e9193e8c3148792643869f991a7855b539a316e44acdbeb9 SHA512 59570e334cdb08b8c092b82f109cf7d0829b2506a3d2112c80ac66d7ee20b7cffd03f84a7ed83039deba1bb534d1023ca2e5ea6f090c1b4797b729598cc94c11 WHIRLPOOL 6bdd39807e868192053ce10901d2099ee81049b1f88df324504ba32e0fab7896360a1e4aafde0f8ea51667edc5b82c62fe2ab81ee807aba7d4836f37e59dcf51
-EBUILD util-linux-2.26.2.ebuild 5776 SHA256 5b37ff05805210f1f4ec74a4e129f7d9809c1d359039062acef80cabd15f9eb9 SHA512 322088aeec205ed49ecaedd9fc7b495e1eb440450f8f3cb93a3e08f4a2c220a83e10589933a8dc40eabe791968a769ff8e056a1cb54ca8a20f6a716b31ed52c9 WHIRLPOOL fef636222cfb22b7bbad42c8bcdd4b51edafadfc566615363ff6a1359c9dc71e6f2a14872b3b8b4f0f9202c121198e2a44d99f5145da7f211a4dc32fbba30c76
+EBUILD util-linux-2.26.2.ebuild 5726 SHA256 90dd5b798efa53046a0c73b693dbd7c757ae724f03d3dfabdc1072b3894b5842 SHA512 a6077958ad2ad34134798b554e665c48be47037728e0b6cde6caa12817b8dc1428449ca18dbdf585e5189203af09cbf99bf68cbe84a3b80e88c80e1534681727 WHIRLPOOL 5b8b0d0ff7169e10b6381aba37842a1d6e7ca31f1f7d811bb457d3049bcdcdb787a51799e9044e32252121aa042a4a382b058b6a92639f6418f1256ebe23ebbc
 EBUILD util-linux-2.26.ebuild 5379 SHA256 302b17d6c0bdd294784b0aca338ba7c5fb08e4ea741bc53da30c3471e129ace6 SHA512 7a2b3fe6a044ba45439c4092c99034704bbc980d71e88816c6e8c1e896ecc0f595d9d5f0d330e3653715a70abf8872554e9475d4f7c08c8160e70c92f1ef5296 WHIRLPOOL 4057b3728c1f3a4d15efd2299000ebc0ce9ef06d161785ef994ccc6f6a824b1b6489966bf7ddca5eb4e86f905d052e5705a914d71d578f5a52406d52e427ff77
-EBUILD util-linux-9999.ebuild 5711 SHA256 e27c0b00b3f316a117108c659143316c0a4eb784071e8c06493550ee081bfcb3 SHA512 efed85f0ddd83f876f81fde9fbef3808c36f22d0e669715c7a74601aa7ca5c15368986aedc765338d0e1980955e69b0bcd0274aeb1bec77faca4f02cb42f2a0d WHIRLPOOL 2eebb34620a0b00634827961b9a6ce0cee1d2341e198183805591983036f1d89e929e5ae57d89f351ffb8400194b59d02617c28615a0fd5a05070dee715d6359
-MISC ChangeLog 79051 SHA256 d21b125ea9be72a38556fbaf9fd2e17ce156613d17cd4b4ebaa5a9694dfc67d3 SHA512 bfa7228fb6b4e06315a2d7c185c7990de0bd639084a1ace161c5c49f73f71d857ab847c6ca484588ea3656cad3547419b8079e3bebf94720abebc34284064173 WHIRLPOOL 05b85c902dee04bde13603b6bffc5f3f0b769d7de4af3017a447e5835272b6da8d9a1a1ede167564a3d18b0a08584a14a7be29235f8f288e48021cc1bba62adf
+EBUILD util-linux-9999.ebuild 5725 SHA256 232c3411ce5c78126588ee3fb0caf90d9b983e27f749e788549446887593120a SHA512 eb03a29fc583b4a519ae40de67d826657ed6a106eee3c598579690081f16993f70264d68a28b50c85cfb0bc644e333879d03fe6820fd42ce94f40c2e34ab4bc0 WHIRLPOOL ba84bd9e7ad7412e1cb000ead19fc6d1196cb313ed34657793c16b60d98c2e6e5937f217e7099a5b9c9ed2a901ef7e822078067016b05edc7cc83efa09e109f0
+MISC ChangeLog 79222 SHA256 8f46bfb6fa3cf29ae15a63d9d482a64044196af6ccd6605972d93da5f9c78b37 SHA512 794cfd5f96e6da3247693c3adef7df1ce451c51e790d0b8f43ba221918053130bf39d4a8a3a8ef642ace608d979b604ba2c55ff348490b0dace4e6d9e53119b5 WHIRLPOOL af58c38f736bfe76bf98a72982165d72fb8523a4d5082d601179a1f93fa405e58c15854b899eb8614618bda566d2f682c7221a5c45984fadb4b555dbe7deb30b
 MISC metadata.xml 892 SHA256 c7f34ab09b97ea7896c5923c219b1431f9488cf15b27c245d4be880ccce87d65 SHA512 33ad8d44583605e115fd9866ff71324c70b71f1937273cc64c89221d8499b9ad620e272dbe37cd28098ffe2d19c9b414448d8979fd7b216ac5c9bba7a1a4d5f6 WHIRLPOOL cb6496cf00c218a0581a8114d82df6e5fdf90293d634d6c1eb12513d25cb9652d1c55bb035d5c48d58901fdcd67b3e23ece8681cefbe5a8015ab4c91bf299b4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVaaJFAAoJEPGu1DbS6WIAFh4P/jaR/hiRMovgGK04ysY3tLsy
-6ZMsTu6ajGyCZKpJvGJWWXgZ+G/RtnfmYRvjE6ROsCw3x6qHO3iVuQgBHJpl0k0W
-MNB2kDQYsmSXctbc8w6tf54UL3FBenkSRNpv/jOHfSwFSIQfywkuoV3d+CX0opbC
-Q69nz3X8J903wVaGha18RFkNDVHyVBiqzTMcL5bJ6S9Yd9wAgtbrw7KhCPNVfTZ6
-0LxzZaV+m3+8WmiFjuh46h+HHWfUoSayqZKytGj6f9ZkWnkrMzERxbt0+MkG0hAY
-My1oA83R4X7i4TvwTu3jGXTjFx0J3hZKMwcyXxmC4+Ro+EMbIHM6fP//8aYxAvoi
-LCTvNn3l7D54gBfjF1vi4SVaLoWFbBO3pu2eCel96ho6MwR3A9mvOcZ5wzZM70wA
-pSXbcOYd+Bm6eRWT4eitgVXSlTUTbh91JkdIuMMhH6UAyT/28hD8FIB8Kf72Ccgy
-q7SNzB9W7kiHBMRFxOdG0H4zH9VNRKBxVIZuJ6h03Zw3TNy5kMG0TtGMHgKfS+3k
-sZft5I/VDR7ZRY6aXUd8wCnVQglWNQ8xmr0HLDwQXIP1+YVKlLpEwQlhYQ5cdSj4
-zc02sHdwMmkMfr1LPVuLoqL3QHnqVGbSo3N4CBBsTX0eybK7+0zn8NQTLPqzh/sy
-5VZ+Mem7SBUJ9fus2bUN
-=1CnI
+iQIcBAEBCAAGBQJVwFJ2AAoJEPGu1DbS6WIAoGAP/RtvAHINeJl+Fn38tTqIubtU
+uLYGOApDWeUonkGceZ4xUd52ry3D8uOSmTypJLC/Ul/COTuypLBFicTPI118fGip
+qSdYDN7s4SkRDgIUZ5Zp/LKrX2yo4hDt7HyakpDHT+Q/XgW/hM5QNMVARehFI82J
+3S2mfR9iXYFwziea/Gf7+uFRghFxNTyDud8B4CXHuIUZzgcAUBWovZjnZ2HwbbuW
+dgaNDuHDn3C4J8BJuW40fZg8+rV1s68RtQSrG/u1bFMMP8EtF+LxmtU3bCvA7mfn
+NclA+topppPKvBkQChmEHK+0YovjXzhYFzsCW/g5pIpDir9z8jrWjbsXo3M8BSRW
+7ZTXxAyyax4WYR/kiod1DRbmdeSz4dtITnCjFjDz5o3D9HQcTlMNoY8VMM5SGze5
+0KbxEWpCLxSOmeJRr1SsFh1kreionmk3YfB8fsJ1U35E4bMVTy+GL6wyPrgAFVJA
+xWy1oB3TjHPjoDsoinn0Zor0wYe+i6iysYBXBkTchHZDAPk7PzvgRVnxSNiduscr
+Ac5iRRkcBb7puTHcp45zzbo3hXXRaTEXIPckcFNxCOj9R0YC6aPW2aNh1Xp0LuKa
+n/hwKAuQ1nIHhaVu7U8IfhLNQPGVuB09FoIyWTWz4QjztnDL+AoVPTY2FAqYq7Ou
+1KnOn3DyewblOh+bceDc
+=qGsR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild
index 6ef5a784f4cf..e6c5ed83db15 100644
--- a/sys-apps/util-linux/util-linux-2.26.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.26.2.ebuild,v 1.2 2015/05/30 11:43:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.26.2.ebuild,v 1.3 2015/08/04 05:49:32 vapier Exp $
 
 EAPI="5"
 
@@ -36,13 +36,13 @@ RDEPEND="!sys-process/schedutils
 	!<app-shells/bash-completion-1.3-r2
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:=[unicode?] )
 	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
 	systemd? ( sys-apps/systemd )
-	udev? ( virtual/libudev )
+	udev? ( virtual/libudev:= )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
@@ -62,7 +62,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.25-parallel-setarch.patch #511812
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 9cdf98d42c72..0b7553621df8 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-2015 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.64 2015/05/30 11:43:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.65 2015/08/04 05:49:32 vapier Exp $
 
 EAPI="5"
 
@@ -36,13 +36,13 @@ RDEPEND="!sys-process/schedutils
 	!<app-shells/bash-completion-1.3-r2
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:=[unicode?] )
 	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
 	systemd? ( sys-apps/systemd )
-	udev? ( virtual/libudev )
+	udev? ( virtual/libudev:= )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]