Backport upstream commits http://cgit.freedesktop.org/systemd/systemd/commit/?id=4f4b92ba7ae9c56cb0f181d5f95d709e085b8bd5 and http://cgit.freedesktop.org/systemd/systemd/commit/?id=6017365a1d0c1c78fc34a7da63768ee5df5da511 wrt #517162. Thanks to Anthony Basile for testing and reporting.

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

3 files changed, 20 insertions, 20 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index c69be18437c9..1483634b0850 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1063 2014/07/15 15:04:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1064 2014/07/15 15:52:06 ssuominen Exp $
+
+  15 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> udev-215.ebuild:
+  Backport upstream commits http://cgit.freedesktop.org/systemd/systemd/commit/?
+  id=4f4b92ba7ae9c56cb0f181d5f95d709e085b8bd5 and http://cgit.freedesktop.org/sy
+  stemd/systemd/commit/?id=6017365a1d0c1c78fc34a7da63768ee5df5da511 wrt #517162.
+  Thanks to Anthony Basile for testing and reporting.
 
   15 Jul 2014; Anthony G. Basile <blueness@gentoo.org> udev-215.ebuild:
   Stable on arm, bug #517106
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 42b7d49f056d..56858b920a55 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -8,32 +8,26 @@ DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f1
 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
 DIST udev-214-patches-1.tar.xz 604 SHA256 363d0331d618b8d731ae1db739f62acfd3df503e71afdf50a0b0d33bf78763c6 SHA512 0601ffa8849e14a56d99f69d1bee55d90e02fdd3bef6bc7f2a6e0ea06705e93e5e0c338aff64c6e0eb8dacebbd8e78cc707ffee214592100a9980cfa328a35ea WHIRLPOOL ead57d1f47361d052f5da038a034e8ab3c74f9055c88e9672ba212e00239873f2fcb778a98e2368551443a5a60aece35d00ba10434afe0752d5b4c7654053c39
-DIST udev-215-patches-1.tar.xz 604 SHA256 363d0331d618b8d731ae1db739f62acfd3df503e71afdf50a0b0d33bf78763c6 SHA512 0601ffa8849e14a56d99f69d1bee55d90e02fdd3bef6bc7f2a6e0ea06705e93e5e0c338aff64c6e0eb8dacebbd8e78cc707ffee214592100a9980cfa328a35ea WHIRLPOOL ead57d1f47361d052f5da038a034e8ab3c74f9055c88e9672ba212e00239873f2fcb778a98e2368551443a5a60aece35d00ba10434afe0752d5b4c7654053c39
+DIST udev-215-patches-2.tar.xz 2120 SHA256 044c4650bcaeb4bd57332ed50264a599fea34429caba93505ed9c56a4b31da32 SHA512 2a91172fd7d21475597303cd68906def282667c4fcd2451db1df90b8a7339a03371bd4856c8f86b67058f5d6bc468fa48d5f5ec5731b233c338888af183acd67 WHIRLPOOL 4e666aa3b8e7ba6b901d06891585854cc3ecfc4c9b80ca62040b67df1eabf4db156577f8345985990f257c97d288468939d1b7a8e6731b90c8c5a3442a6074a5
 EBUILD udev-208-r1.ebuild 15723 SHA256 7f5b0e87086b1da86237795ebf699d3b9fb75ded1dc7f7c94973909d2d41604e SHA512 284028c7054b53e0ebf0e57a70a020fb4e0442e024703a955f48678b9064a7a04a2a3f433e4c35cabb8017b93d20798115bd1411733de6dedb119a8edcceaa4c WHIRLPOOL b62db1c1716c83fc392fb9869bb4ed55ece6c99f464ec945eb35d33022d9a37aa7ac493a2d120dc6a866ac550e7cc5c448dba63f5c25f1aa2f47e36d383b5e0d
 EBUILD udev-212-r1.ebuild 15905 SHA256 560a445ae97ba166e964c2d7c2cb58f181005446946a92343482ac66094342a7 SHA512 e607c968da7e23ac2b1cf77125dfc453d66c3593e834b341949eb7ae67f2762540c5e3290d36d7a525d80f70b6af693fe72a295ddc07d008ca3b74ca1142f13c WHIRLPOOL e8e5623aa77a8a8846e93bb1f7e2cf6e2661a071497debc03c6a0cb9aebe9648964756d891f08c62595dd23e8d6972830e7bda4ac5396972d06088a9903d6127
 EBUILD udev-214.ebuild 15547 SHA256 4b4bd620b0ecec3a4911338f2a50a02c59fd0f48ef1b0c09c35a98472b3e0c36 SHA512 448159628e27a07671c72d73d3a41722bf10f0731254f8658c57e2cf17603bf6870ed56837c4d8a3e1b47e00f3c4d938b8884baf891134f236392ad4dbeb6016 WHIRLPOOL df2c6784a545be966b8716d7ec838de5bba2d1f5a639babfa85f590d8c14f98e6bafc3dca7beb7884d96e6f93262d30cb1dfb6c7c0d364bbdede88426d5fd665
-EBUILD udev-215.ebuild 15355 SHA256 934e26a05aa18e2d0176e8694cc8d76bc6425ebc32800b4dbbdcf04a5bd13f3d SHA512 59df363bd08cee4a22e6bb23f89541b3d5e10b7b2769ac3f7dbdeb5f2689f3159828472808bcae4ffbf61910d5b9957118ccfba3821c858f1dda7e245253a1aa WHIRLPOOL e17c22aaacb61743b7b79b2dcad879900115764e99d238b445b850b89df97fa7d54c1f922cbdb26303b630eb2837cb97fb3d7e1f05625d6da3beb83882f7dd09
+EBUILD udev-215.ebuild 15356 SHA256 e49a5c39a6840ed690ea90535669fa58f91a5ec4a98e18a4387e6c38488601fc SHA512 843c05e4f98a44664768db5afecaf0e147143cae666ac7704b5f2c18cb06df993851f840d96035f795c5a2dbdd6344468bcc6f3578b0e813de63aca0f3e9d5a7 WHIRLPOOL 118a414cf96fb49a4eb8c222dbf49a965c40c503e73e002a99730eb7dfcd99fd1df504b9d483ecf63656d415ca5b2adbea1838eb97ccb7cd18fae4b96c8d99d9
 EBUILD udev-9999.ebuild 15209 SHA256 40c1ee9639ed54e2a66bfbfcd83be659d468a3c11b8a012c451b978b3da1b8b6 SHA512 3d53874fba1cd56194b1ae6adc10959032ffd026fea3d4ad0a8c853193d4bcc85f3ee45b04f758df6ad819e55974ba862690d04de726fa9195bba4b12141ba8d WHIRLPOOL 5c3c62c707b0e2faefa5a71505c79e3c413c5cbb2e6cf1aea04d47c49e140bae3bbf70363b7f5e84a138d3182ae3735c13e94e61c17010bb02557a007bc1fa07
-MISC ChangeLog 52981 SHA256 8ae9a5c65eda7878b908273d0f72e17bc31766053dafc47ab7f00ce67ef31181 SHA512 ebc32d6a6258103036713bca3693906cf0bdb25c8ee263a876c672f19ad06944328399190a676f558ca524ec339feff837cc4b9d62ad4f675df0a04253df8e81 WHIRLPOOL 44504e16cd3839eb61eb3dd3a3e4d102c7e4d0d6a623d56031953a02ee49a2cb53839ce628ffdb204361eb7720936d15ca9c598a8b5d8046f51462d83dc73a99
+MISC ChangeLog 53351 SHA256 b4224650c2a67a95b184662f079cbf1733b04059140ff18125385b9d842055d4 SHA512 6b78c0ca611da0b3f954884ce7766b6a5af2fdbac17d8a02e70a1f55d5b2eb5c333d2bdaed6d1a38fbd7e978d52f26ac2a6f158d01d6b5fda23d75cf8d79fcbc WHIRLPOOL 7a57b9b07e5114d4207c4d72530ad08715c52a80125d4518fbef84c0825c7b0759599b916c931aac394942a7bff6f0df534834e0655e321a39ed15cf9aceff89
 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
 MISC ChangeLog-2012 23242 SHA256 5466af35dd494cc2a4d0bc9cc0f4ff03e0d3d7ac7ec595a70b2b15896f33658f SHA512 8488fe00da8ba8b3db5d72c35ee3ed5b372a673a09eb0422102583a76d6671ffded8d0086362fddb2bb056a9b9a1f7c3139dfbb48d0bcd12a53ac07ad9473e68 WHIRLPOOL 0352206d82c41cbf3ac0fcbf3392e8e7ae94e8bcf35d8cb8a99c48bf790aa94b9f90a627deb155ab41d8c2f028658720f55347a6e1048e5c798060cc579d2c49
 MISC metadata.xml 610 SHA256 5483522dfe99f75e0f48a38a03338037f8229e8dbdb4b94aaa616f309ad3b9db SHA512 20a0bd240bb087baf3afedc8db42e38c179c89cd0a2ae50c5d3794898f01857d35fdc60010de1dc41d85c9c322d8631f5bfa66612bfae32a27d4a33ceea4eacd WHIRLPOOL dcf5dbe4f23fd3098c8e740ace7ecad1531079001f9c422ed14a17920d0adbe3767dfc6a1e87ddfdf428a06d878245bf87567a7e44fccbf8940c60c020844e0d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTxUNCAAoJEJOE+m71LUu6s8MQAJX297IJZJsC2hslWQ/165Lr
-irlsc/OVz8eIufl9xI9KLQhpeK6ag0u0xncggOYVfovLV71YK3zhPZRuIfVikfKR
-TfFFjnJeOLvlqKhF/CHjJ7cx1+/Mv0XmtsHKTDO4gAjIrYodsQvW6zijwFmy1LWI
-b66SbqE8B+dIAQyVwO+WDJIyDyeYtHa1CehZMv13OjZU3D7dnLhxn2dLLuqQAfKT
-CBy6lLy19wAVpk2D0jXCJVZk9y2HS/pbofkIZXCdCcWMjMrtmTEJiTleV1n96YHM
-ZYDD6v9iPda6l/Ucy8kKZErJukgwJXpCArVRKxhrkKmHL9WBFqh/3jhf+6SqgtoJ
-F3q3VS0u+LH/7480TbfpNJezyRtduVwPOzJYNZrI9xY3zOC+ox7YQw4TXHZXwSln
-zHllNiG0crcP/+yqKAYanMZGEKAvQKJa+etdCktNYjhrG8BEfWSnVlBtkxchVK9+
-tpnlbCfMQcbTdyjyDfBID+ul16NzcCfmskIi2e+0WWzq5u1TQUv2HP2cM3WnL1ks
-8LR6p2nQq1tcoWYZ3uve/xPkbd5V8nPcf9YJPMmS6nsii2iA0pQunzHsAAD6xWIm
-GQExNqaZtwRp+7aqg7HcS+qVyzoJ7umj8hcoFftoYRvt38Jtn+l7E1iUoasSMdf3
-yNxclaPAd5/BwQtpjUX3
-=vBMc
+iQEcBAEBCAAGBQJTxUzmAAoJEEdUh39IaPFNkM0H/jmYmUJtL/RtyPszz+51Y8E/
+bH2qCQoPE7v+KxRJBhRsJ1bMgYvBPA5vNbqOICX/EhkSq8HMHcL7PtkKATadUMdw
+JaF0Ls9ymGeGB0MxpepI0QJ9yjstetBERCDQFaA17pWpqM8He0L09u5fJY7/DrtV
+plKPVqxCImH3Ju1TmMNOI+O1aLZ+UlzO70mbNoJWDgrkeiczPUxv2vhlHIlGvSNS
+tNg3LcEpzo1Jm7XLyb2D1gE+v2djsVQ598JioCRdVWdJ+74QR8xVSBAnlXON4Hi9
+Yu/drZRTCPFjQHVQwHXad1W/GSjZhhJH71uRVVaw7q5Eqdm688hIppERclOeG6Q=
+=FXXH
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-215.ebuild b/sys-fs/udev/udev-215.ebuild
index 1ac06f9ad098..a8ec460c1b85 100644
--- a/sys-fs/udev/udev-215.ebuild
+++ b/sys-fs/udev/udev-215.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-215.ebuild,v 1.5 2014/07/15 15:04:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-215.ebuild,v 1.6 2014/07/15 15:52:06 ssuominen Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-2
 	patchset=
 else
-	patchset=1
+	patchset=2
 	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
 	if [[ -n "${patchset}" ]]; then
 				SRC_URI="${SRC_URI}