Synchronize 212-r1 with 9999 for most part.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 23 insertions, 18 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 6e0c9ed640b3..e7ad7d1f43f0 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1030 2014/05/14 18:22:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1031 2014/05/14 18:25:40 ssuominen Exp $
+
+  14 May 2014; Samuli Suominen <ssuominen@gentoo.org> udev-212-r1.ebuild,
+  udev-9999.ebuild:
+  Synchronize 212-r1 with 9999 for most part.
 
   14 May 2014; Samuli Suominen <ssuominen@gentoo.org> udev-212-r1.ebuild:
   Flip sys-devel/make and sys-kernel/linux-headers blockers to DEPENDs to ensure
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 6513e7025458..f3fde79a9c47 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,9 +6,9 @@ DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d5
 DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
 DIST udev-212-patches-1.tar.xz 600 SHA256 378b5c7d11730440dc14a8d57219924ce661695c05103f037c23bfc54ff6f28a SHA512 a57a872656852c8bc4b8df537c7fff7a94f492bcd157f1adfd2fdfa47937e96363ae5ab74788253d615e15fd871b0363f6976594949747dc25a7c32da5c853ba WHIRLPOOL b491dc0c9b416dbe7c3f476a82a8dd79bc62595bea208b1d15b046758d82db1ef1f176e2c1883d0d29c18765e7c2840a67f9ef677f24b675a8546c2dfeec6ce3
 EBUILD udev-208.ebuild 15609 SHA256 b8fbdc0e34ab742cb251df59f80ce4508c29539138b62c3cfc1c58842935d792 SHA512 9981ab683355f836219229acfb79bfc732d045e6b723111b4aafeda02915dc3de36df8da77cda777604d773610b4a2d79a7f29dfed5c0c696cffa4cb57ff2a83 WHIRLPOOL a3449ece115ff843af6cbff8c238c8269c0847d02e7302cbcdf1addd0beedf3ecc613fff08a01851e6f0f087425890dba863c983742c6bb0511cf540e386ae14
-EBUILD udev-212-r1.ebuild 15922 SHA256 8edeb3271aed8ad56cd7460bf9f1d0babe9c7dfcf9b0a4445e01bc16b92cab1f SHA512 a1587113fdbbc56823b00ad4a0ed3849a98929b0aebb3963627b25d0896198ea4258c646c664e14ac26735f52e3f4751f8d2ca9c47369086853299de5c5e1344 WHIRLPOOL e1c22ffa09c27665d43ba802e753a93bf14e43c90f05a2862833bdb4b034a66dd795d8dd53420b08f59ac06515ed8137a2341ea8ef74b46ae7c71303ede269fc
-EBUILD udev-9999.ebuild 15847 SHA256 bdb977257d06941f2ba55f2fa590eded44f51f9f03bf86e350e863e6a32d1d8e SHA512 ae641035e8daa9a51f36d95d2b26b0cf9fdb717d3e4d16d4d594bd0fde1f3e0c1059406d889e9c33666475e513729e3df283d93ebac3c577f33cd63d555e559d WHIRLPOOL d362601d139be30dbcc1f7a23801bdb83bf92bb368fb8c7bb0bfb949bfd3c8432752f2ab73a369868df3ce5d969250d35be76364bc2dbf9e0ae58ef78d122a8d
-MISC ChangeLog 47281 SHA256 f0fbd4789c31c3f380c7a537f0f5190d5605ce63386c39d2d026855082ed18e8 SHA512 23e100063a9190f666ace0d13a21ff7f2bdc23c9544a75c7623278adb267736c2b6fcdd1d6095c8e54c9187c26d8d5ee904690288ab4a27fcc4f355107b3d7c7 WHIRLPOOL adf23e5407c3cf3dbea6f35364cea60c1cdf07915a46371f48cd9f5261551a3fc64576d80153b8e42a02a293b319080ab4b39fbc4e17817bc7e1d0d563b01ae0
+EBUILD udev-212-r1.ebuild 15915 SHA256 7b124fab4c68252aeb82e3d8a7fd60e60aec1cfa825d0c2decb3d08f04eaa096 SHA512 b3ddec0a9feaca6217b75195a89db6773e28857cdd48e40b550fe9b253aa8b5086a9a055a453c07c74762c6b43991ac12e6194ee6d85ae187da33e7c63418337 WHIRLPOOL 762342da6f14435a9d7ef7c3b2ecfdc9a4de9991ce8c7e327b90137ec34e526828dbfa3292c11d2ccb83f229b5f87c0ac8b88ed188ce1d1024800188735b2494
+EBUILD udev-9999.ebuild 15920 SHA256 c557d571b8161f67ee54fee355ae522a8da520535f113eebebab6601dd563d9d SHA512 ecd6de8ae4333925ca4169d282b1f3e42c8c528aedc8b34b8b804180f054cc30f66d8a27040f06cff6d6a86bec336c24a99a1c5dd389ec37df70c1343148194b WHIRLPOOL c668b5fa18af89e5ce57146a0ded07adf4610416a01e99113ba86fb3fed62895330e6de97e026bd1f8daca37ff5d62ab003174dc1c268472ca59abe33bcfd64d
+MISC ChangeLog 47422 SHA256 2f97679853f598eabdf1bf1aa377c30a2f31a54bb1b2ea499b1b1d80c982be70 SHA512 1b457adb12821895e64a3cb03166774ab8501a0012fb577dc2ca32ce7e65a7ea5e06c19f875dd39e409c094dfa879616638e8cd2cfab70386f24588ac23df8ae WHIRLPOOL 043851abeb2c957ea53d8407975eb96f1e9db4699c8f7187db2a6df881e6485bf1759d07ad722c8f89fca3b0bd73447d42feb60032e56a2022ca3531ef1f15eb
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -17,11 +17,11 @@ MISC metadata.xml 671 SHA256 a08866f15d60a320bc7685fa43c319a48bfb1d68a439a08a773
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTc7QkAAoJEEdUh39IaPFNnfQIAIqfhsPBfqpxbag4NpZiGbv5
-l2wz5cPQqGwvzqCJaAb+QTmc0PgxzilKR9k+Qqb7m5YdyP4SUYhvwcwE9Y1meBcF
-s0zfbczNhH9tnUiOIGyQt2nOlrc6tKJIcnLUXyDdKndohoXc3pgK4rbsRZ0Njzkt
-Mkugi7N9uYzTVmNE1CfKQTjEJF2nM4Ac7vCYzhHFajxlRUNfqlUMj9PeQguxmdB5
-r3ks+TYHQAPWYn72sKLdAJgJksKZNBq2NLacT+RF9fe0Sb0xSHjfpupSazR+Lugw
-2+7jKz0b2gifnHzPBJkXcQlVjBuX9B9Ce3abAmwNXvToybYHv/7AVOE55jk9sJo=
-=7VfJ
+iQEcBAEBCAAGBQJTc7TmAAoJEEdUh39IaPFNOAgH/jcl8ua38TEMT52u/+jwcfj/
+tPS/0myBOLvjpPU5cgHqUVHIJK1UQrP3wivwUOuEZMVqwOuWPyYM0gQ1sR/79rCy
+yehFBIgGGCnxlp2NsI8mK+yTcHCZ60uLGTPTfp8/4FBQtAynbOvmElAdWNKAyRic
+nJKGBT3Q5XcJck21W1fpe0Gzb9B2evGUDZpycILzZSai+3z/X/oCfmGFDPqdFgpb
+BtV7aRsrwB42aRWW86/BIrccnOL/ZK+ggn651XL21niNwayCCeCHoXrK581EIz6o
+bltLD9rwJNb28ZV9v9MhlWPBAePpSdpp0qV2hVlrPRqp5aiv1OvmIAVaH1v7b4E=
+=1wdt
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-212-r1.ebuild b/sys-fs/udev/udev-212-r1.ebuild
index 44b33b3c5d35..8f5a811af80d 100644
--- a/sys-fs/udev/udev-212-r1.ebuild
+++ b/sys-fs/udev/udev-212-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v 1.12 2014/05/14 18:22:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v 1.13 2014/05/14 18:25:40 ssuominen Exp $
 
 EAPI=5
 
@@ -9,6 +9,7 @@ inherit autotools bash-completion-r1 eutils linux-info multilib toolchain-funcs
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
 	inherit git-2
+	patchset=
 else
 	patchset=1
 	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
@@ -482,9 +483,7 @@ pkg_postinst() {
 	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
 	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
 	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
-	if [[ -e ${net_setup_link} ]]; then
-		net_move=no
-	else
+	if [[ ! -e ${net_setup_link} ]]; then
 		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
 		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
 			net_move=yes
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 72287c4630d6..130d911ad1a0 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.295 2014/04/28 17:54:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.296 2014/05/14 18:25:40 ssuominen Exp $
 
 EAPI=5
 
@@ -9,6 +9,7 @@ inherit autotools bash-completion-r1 eutils linux-info multilib toolchain-funcs
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
 	inherit git-2
+	patchset=
 else
 	patchset=
 	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
@@ -42,13 +43,14 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
+# Force new make >= -r4 to skip some parallel build issues
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	sys-libs/libcap
 	virtual/os-headers
 	virtual/pkgconfig
-	!<sys-devel/make-3.82-r4
-	!<sys-kernel/linux-headers-2.6.32
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-2.6.32
 	doc? ( >=dev-util/gtk-doc-1.18 )"
 # Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs
 if [[ ${PV} = 9999* ]]; then