Block sys-apps/gentoo-systemd-integration because of /lib/udev/rules.d/40-gentoo.rules file collision.

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

5 files changed, 23 insertions, 15 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index abc04e9685b7..62b21468b8f0 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1005 2014/03/04 06:37:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1006 2014/03/05 17:44:35 ssuominen Exp $
+
+  05 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> udev-208.ebuild,
+  udev-210.ebuild, udev-9999.ebuild:
+  Block sys-apps/gentoo-systemd-integration because of
+  /lib/udev/rules.d/40-gentoo.rules file collision.
 
   04 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> udev-210.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index fc9c322acbac..c485429676e4 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -4,10 +4,10 @@ Hash: SHA256
 DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
 DIST systemd-210.tar.xz 2620924 SHA256 e2b3ddf9bf82f05cc3079650e86ae05b558381fd034cf1b03a592bcadd1610c4 SHA512 4aa5da0585dc5439591b82f0f67b58e806a795011c4d19c84cb2bfa7c27b3c995957e33b4f24b4c6e9f012a55cb092d2445e6f3b27b020d1c789c757230fcbcc WHIRLPOOL 546aa684f3f56fd9cbb2c6b8332bd74314e1a39521b4e33ab9eccef7f87b885a9c96842ca440a0a4f0b4200de7bbc9475687dc2e295420679b1dfb906496f273
 DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
-EBUILD udev-208.ebuild 15594 SHA256 d255ba9f5dd97a5c689687361592dca5438750e4a175a9a966b20d09b8195f19 SHA512 855ab8c83cde57239db0e812f64c72dd1b047671c36c5c50f1ee467735b9ecd98edc9d3742355aa111cc063276357911d3e40e474544f4866d33e24ecac327f4 WHIRLPOOL 51c5ea9c10efd85752b6c88dcf60dd938c34ed5d841d0dcab87d03b4a71764b9bcbc246d9e7bbca7791a87be4082290cf3ee8dc7ccf77d6715ef05a15246e092
-EBUILD udev-210.ebuild 15680 SHA256 987fff49d1ab8f730b1ffddc4d08b647af09087fc19934b0dd3bba4816192554 SHA512 73c53a719ca28f58808573fce513a5f0244e243a6579eabd9cb7efa66201e562b153602fce818779cd420724fe1cf00c7bbdeb402ff1b6036db99b18769b5ac9 WHIRLPOOL f8307a3f2f8eb5070e3f2dd487532531a2f4cd43eebe122ed66cad60f1223bad7b01eebe546ad4d2fbb95006f4a0b4ab8d1bf9d1a6e9dda9e8de10d3a405b98d
-EBUILD udev-9999.ebuild 15663 SHA256 b5ac97d658f89e432bfd97838f1fb4ba87e6691b5f83f773a0f8f8a8ee479073 SHA512 935cb3169ab84d7ec67318d789b51232b500d719aa1afaf36b5e6e401f4eb47ffac1dce24c530360e0620e39771b6edadc78bfdb3ad65c25429a8329517ec548 WHIRLPOOL 903332395920203d084813c4649e121653693a8dcc65d13b6f0fef19c30fe3b129a17bd937582387a1d669a69ffe5d470ededc1b5b39bff4a326f113eead3adb
-MISC ChangeLog 42741 SHA256 e70217155e5d35fd20944325e637b9211f30364f8a9f020da59c30a6eaea5370 SHA512 88cd95d4ae958a8b0101eca548b76a56a4e80d32fee8eeb09602755b6e5717a62ab45c0a732d716e6eb76d7d6f3befb2af5691333eb53f6253ae770522f4a2c6 WHIRLPOOL c60363b1c97583f7c2fc737c3e8bb2b78bc020d3847be278e262794608f9b2e2db1917b9446d07097f0dfa252b3f0533949da03e39e8696cd6f51bb7cc5c1cc0
+EBUILD udev-208.ebuild 15638 SHA256 3aaed1f24d891f1358aab141adcef6b4a0f2430caf060287c43d2321b9530e31 SHA512 e5c1b0e159bbe71fd2991ef1bf09cd9a5969eb3c0b5df1f25f69a9b72ff5e09c2563d1dc39bf528b728eabcfa49d6733c1b1cd26f62a1b4b4b306e643edde18d WHIRLPOOL c4140152feea3d54e8cb3844c5c4306db7b03ea2026574dec9e60d86c81975b0e0df5316a46cc95cbaaa3f548d9462a93b44ecfa10c75533af19c04b6c028c0e
+EBUILD udev-210.ebuild 15719 SHA256 854c41003212b853921eaecd1b8c0abf0fc5d980a62227f336afc52ec8b8ad45 SHA512 ca5a6bebafcf88fe64507d2abfcc9f1d103f265ab7cd5056f7655b1671a85a3131b7dadd3918599b0d9821182f34c1d322704f6292066ec8c5dfa21e2aab9079 WHIRLPOOL 8c496164abc9cb58919933ad085c2219bf1c0e5e553d753d4943935f8e6043f14dd1d0c72f84aee9a149b9511e381faaf9d2bdba7872945c9004a14c5ae66c15
+EBUILD udev-9999.ebuild 15701 SHA256 867e2fb0d33cb52a19ee96b507a665e8861dd2776f55082dc599d738967b6f67 SHA512 6e96436571477c41bb89b182b61664f23b64e6c568f77db857c98a342b002f9f3c143f7004910dc3a5bc9e4667479ad626604be6ab88004fa0bb872b7905d18b WHIRLPOOL 8259f3c5d7fce2ca33cc0794cdac086b4518b7f9b6fe596f39a0fb6f254438d037b139de7b32b5b304ea9650bef0243fc4882efd6341bea2f1578347f208a958
+MISC ChangeLog 42957 SHA256 90135e9abd1b1d20fb1d8b3e7f24e36d24dc512238ab0ab1cd2aab5c030c80f7 SHA512 a16f206967a5e2faad0f685ccd9ee1644906afca42e6fb63632dfceb65e8693d855e104a236dd2455220edbae7ca14fb8556b8a3ee289edfe63345d1b4c37ebf WHIRLPOOL e3828bf6b67b9f840a5789925d8a63bac68c0f92491f726210d29fad58c5ef54d88ef6d5dbc51a51c635f05472e77afdfdeeec016abcec65d697e631599d07b7
 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
@@ -16,11 +16,11 @@ MISC metadata.xml 671 SHA256 a08866f15d60a320bc7685fa43c319a48bfb1d68a439a08a773
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTFXQRAAoJEEdUh39IaPFNV5wIAIxUSczCmzBQ7h0Y+xc+Ig7i
-/jSmXqfkw1SU1NQkxHw3FrLqK3FPky+ZOyn8urWUj6KRq0xSMDVgIDlJJGz664Vh
-Zc4DMNpTZYzBB6RDu5RnULlNuK3qAHMm8KZNGkrfIZYGNyVK/eZHJWMYfbK3plls
-c5tPkCvux4KjXUmoRZUG9uySrL3ROBycFcHhj0i2Ti7UZuF9VzcRw+2hN2pEa3UQ
-wyOPIfzirRa0y5+AuMwhF3Pm/F6zX91NWaeN5Pt3/Vzxq6d7KHDvpNTyh7ygs1dv
-FVucSqSNFP0Yf+bLjkRdQXcvo/8+TUS2GOZHv1TYSppxxSrJ5YTfPssgiDdogV8=
-=+nKk
+iQEcBAEBCAAGBQJTF2HHAAoJEEdUh39IaPFNrucIAJ6o6cC2lMBpTJOhQrvFMpcm
+yli2rRjyBZltKjRhZraJ115Sn0aW7MIi3K1aXh5fpJN/kf7ATvdQD9MONtYziq8Z
+3kTOy7ScI25nP82T8SGR76bBQsMEq9y2a+l6H2S//a2oXfqBeZJ74YDmYtKFNeUw
+c386kLCr82Sndv7rwYLB1x3WzVd+bNobzc0SMEW/CnZckCebcDuP1n+2wjRwaVnU
+SL9+Dxb8QRCnADQoKfoHOAGlfxYCXpzmQFD9l99TseNRsX3dTsl8i11W0xQvrhr4
+b+V+4SYxsPlpYiQh+y2qh5U65a1OULVWm/JogWVgtENWcGOmYk0kkGjhDtUIqfw=
+=Z5W+
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-208.ebuild b/sys-fs/udev/udev-208.ebuild
index 3e46968e35d8..79b29886ab28 100644
--- a/sys-fs/udev/udev-208.ebuild
+++ b/sys-fs/udev/udev-208.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-208.ebuild,v 1.15 2014/01/26 09:12:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-208.ebuild,v 1.16 2014/03/05 17:44:35 ssuominen Exp $
 
 EAPI=5
 
@@ -36,6 +36,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	kmod? ( >=sys-apps/kmod-14 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
 	!sys-apps/systemd
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
diff --git a/sys-fs/udev/udev-210.ebuild b/sys-fs/udev/udev-210.ebuild
index 19bfc8ff225e..fa00ba451496 100644
--- a/sys-fs/udev/udev-210.ebuild
+++ b/sys-fs/udev/udev-210.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-210.ebuild,v 1.9 2014/03/04 06:37:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v 1.10 2014/03/05 17:44:35 ssuominen Exp $
 
 EAPI=5
 
@@ -36,6 +36,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
 	!sys-apps/systemd
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index b48d8cbd583d..2d3e705a30cb 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.279 2014/03/04 06:37:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.280 2014/03/05 17:44:35 ssuominen Exp $
 
 EAPI=5
 
@@ -36,6 +36,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
 	!sys-apps/systemd
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7