Upstream uses --rootprefix= now for networkdir= so stop overriding it. Override dist_network_DATA= to only install 99-default.link since upstream started installing something called 80-container-host0.network for systemd-nspawn which we will ignore with sys-fs/udev.

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

3 files changed, 18 insertions, 13 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a102c2f777c7..f1935ff551fb 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.990 2014/02/21 13:53:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.991 2014/02/24 05:58:09 ssuominen Exp $
+
+  24 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+  Upstream uses --rootprefix= now for networkdir= so stop overriding it.
+  Override dist_network_DATA= to only install 99-default.link since upstream
+  started installing something called 80-container-host0.network for systemd-
+  nspawn which we will ignore with sys-fs/udev.
 
   21 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> udev-209.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index fcd32ea0416b..bb6981200dd2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,8 +6,8 @@ DIST systemd-209.tar.xz 2607304 SHA256 4cadef26adcd846e3f2b90502e64f590430baf59a
 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-209.ebuild 14983 SHA256 b6b454d5bbdf540ead6fc06d5a3011626d9c21fa6cf4b38a37f00691152ffa5f SHA512 741bc6c3a34d595ed86db8118847e6c5bd91cafc9349eebe95400833e9815d5896b811aa606e484c21163f96855ab33978f9f6142e4dc112825e64bb949ce648 WHIRLPOOL 5491b910e9d753bba75350a296810315d486be7cdba7892aa2816b637e8c4c33b7f13c84234a6e93f7beb1f3d9d5f039f2e45e39c9ac1572c63840921c524ea7
-EBUILD udev-9999.ebuild 14893 SHA256 b721c8d8a751b5085682e0b1b1a15a8aa9c714f31fb96dbe182b7adedb61ac55 SHA512 c50acb0aad88e3f0e38d59408b19dca36e38150aaf6ade89e4bc4e47d3019ad60ba8020746cea74efb9d90ca1d7f6b623b4b14b8e5b8b256b86f17c73ac2bd3d WHIRLPOOL db075a4316215660f29478a8ce43f5d84745ec69fad9bb352abffc22b80a350565d3ba245e79972b3a5fda8cedbd19c506cf684e0d8c533285ba92025783e682
-MISC ChangeLog 39254 SHA256 c32ebea726e733d5a0ab6117a87bce29d980b645acb65b18124884d122e240f2 SHA512 6d8e43db228673cc0f562fe9c394ed449b39911dd0868394fc41ef23bba396ba37d2b5a38d3c772e809a59a156dae09f51ed2fcea98b0177f1017cfbfff1cf2a WHIRLPOOL 934398542409e92c6182df48f65c3680bde012c94da87d2917c0341ec70f2c5cf5a2cc90823e2b6957fea132ead7292000a01ef6712cd95ed1cf7b3e430632a6
+EBUILD udev-9999.ebuild 14827 SHA256 6f163590a858c75dcfa35d6480e4e3c8c77fce80bf5b485da037153a79b87689 SHA512 f03048017492bcade9a6edc554fb547c49db987888c86cd3936e5630167a8cdaf38865e1fe4376a3a7bc1c98adc73b303da375508c70b84004641da8e0b35997 WHIRLPOOL 65cf31cf98f626304a55988588b76361c235cb18e6a37bd374ad82d038be9da774c31338e8c4f427781128c407271c556bea14b7d9ff457ef3c916ebaee1a779
+MISC ChangeLog 39603 SHA256 454c2ee1c8a857e190761000131ad48259b555ffcd7c1c89e1716ccae9289b55 SHA512 d6999198acfd204d1885741efb789f8e2ac9d11bbcb033f18dfb01ab102996636fc2b0bc999c008f162fb123a929a8dc913b40b37405110c89e86c43108a0d55 WHIRLPOOL 3d77578d9b9cd08d164a7c2821ed7cc53c0b3d4cf04269ec6900ab45f4f59d2ec4ef5d11b140558b17f67452e71dd8412d3b7615b43b001ee23c5a837dceab28
 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)
 
-iQEcBAEBCAAGBQJTB1nkAAoJEEdUh39IaPFNnY0H/281zsxixhIAZu+wZryCsKz5
-nEOoFEklzx4zrVt6p8EqQugnIH3VeORKl7rFmt8oIsXEViwU8qYG1USAXPe7zYSs
-zRL4hxomiqgKcTVzXUMoupHMk5EbAyFzhaQty6WpMf31w2X3peZQh7rXH0KF6P4N
-c4N0038LyPLrrZgGsfOLKHOWS79dsv+JPUDDn1Lw12geHJN2VYMGidmGUotu1FaV
-dkZIEtcY/1I4ZGTjx9ef33y2v/jVPGD45Go3rcDnkW6PyZ6UFVrcXG4JQb+PphQJ
-0Uc+kM5ITBu9da9nUid71D9wTN9qc+HmKZWG0ah3CBQokwUcqbXxsBQ51hEOfrM=
-=2zfW
+iQEcBAEBCAAGBQJTCt7mAAoJEEdUh39IaPFNi8QIAIrejDjujWp8UEr+0ab5DNtX
+NKSLYg0PYefj+tjFDgSL6pVs7yjTr6B4jyUqOjUZuhBE2F3+2BgXkgagTZYvl2XM
+BBKqrNRgatAeyKHeoGXyK9ELoYN+4mb0lTmGvidP+zNzHcFU5p9h+dtKwKGIrXnu
+MsGt8KiECsPuRDzlL6IvfjokS3VOq/g5jr99Y8REw1eYtCkqOTGwEs2gNCLn0yTQ
+eqJ2wGyVpcRHLKZc25RC6nosR6X82dU96KZKqhnRkvaC0omo8SSKaLZtBsiFZmli
+XBZcsFmeeCV7HAz7xiE8XxkMbKKQmHXu9O0VlFIevmuqBp1ni32+cS0vs1oMGm8=
+=HyJJ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 6dd8f025f3b3..8bb131bc18f4 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.266 2014/02/21 13:53:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.267 2014/02/24 05:58:09 ssuominen Exp $
 
 EAPI=5
 
@@ -325,7 +325,6 @@ multilib_src_install() {
 		fi
 
 		# add final values of variables:
-		# TODO: networkdir follows prefix, not rootprefix, which is an upstream bug
 		targets+=(
 			rootlibexec_PROGRAMS=systemd-udevd
 			rootbin_PROGRAMS=udevadm
@@ -335,7 +334,7 @@ multilib_src_install() {
 					$(sysconfdir)/udev/hwdb.d \
 					$(sysconfdir)/systemd/network'
 			dist_bashcompletion_DATA="shell-completion/bash/udevadm"
-			networkdir=/lib/systemd/network
+			dist_network_DATA="network/99-default.link"
 		)
 		emake -j1 DESTDIR="${D}" "${targets[@]}"