4 files changed, 530 insertions, 19 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e82f9466b725..ac28f77ccb4d 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1047 2014/06/09 23:10:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1048 2014/06/18 15:19:18 ssuominen Exp $
+
+*udev-214 (18 Jun 2014)
+
+  18 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> +udev-214.ebuild,
+  udev-9999.ebuild:
+  Version bump; update md5sum of 50-udev-default.rules because upstream retired
+  group "floppy"
 
   09 Jun 2014; Mike Frysinger <vapier@gentoo.org> udev-208-r1.ebuild:
   Mark arm64/m68k/s390/sh stable.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9f8e2e2feaa3..46d164e82882 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -4,33 +4,30 @@ Hash: SHA256
 DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
 DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d55ea38b0013a6f2d0863f2c2 SHA512 3e6dac77785cb2f928886886f92cdd11ed00a4db1453699e0102d3ecffa03d1795f44df10239105e4b2b039f0e3e4b5d44c9f876f25c10a6dc4f7e1fbf87c333 WHIRLPOOL 31d1a967435963155c60ca5016f207aa105e9ddcb7d73e9fcde20f7e1fb66701384b81ee01134bf4d75dfa1ea0d412bb352ff11ac6f8c05e836135baf94bbe37
 DIST systemd-213.tar.xz 2782712 SHA256 8a8f73c4a9c0602f3125d6a59e45c9d3fc6db86eb1de6ade4e7fa342cf7f44b2 SHA512 28baaa07ab63e3c4b328dc714b0411c9d895cf48419dbc11b08aa6d3a82557fb0fe0d6d48060a67773d312a9dcb5f7d31be973602cc8b5bcff03a28b4022f6a4 WHIRLPOOL 7ffcc80e6adf25732f03b20e94619895fcdcd1c04dcfd910c3cd58086abb94417971c87d06811936fcbd0d778fcde6f39a487d7e49ea9fa964977dd58af3b97f
+DIST systemd-214.tar.xz 2790264 SHA256 0e902796e1dc4e9cd3ee89793936166adb4a538605edd9692e271824c1579b15 SHA512 7e0a7541b7d423c9e8f9d97b8862bb68566bde24e0f6fbc4519c0b32da321d4339bad13dba55af6a45d61c713fbf49ad3e2018fcba1195b772392cbf3a87f83e WHIRLPOOL 443c42a53c0e2b5dd578fcae6155a757dfe98af4a29ac2d89d3030ed0d9b896342ccb048860bc4bc48abdb4d15755f474e3881a5fea2d69aa11c81d201f710f5
 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-213-patches-3.tar.xz 1180 SHA256 71c6a11359ca7d96d013928b64249522bc3dad07a46f402574d55ca1268efa6b SHA512 f06f5648b27923a1b63ceead4375104506aa071fe932afa9182aff8128c437be9a623a0739f88a5d7190fdd75708b800e0880d2da6a8e16262a28ffc6722da0f WHIRLPOOL 3d4890ec27a3ba8a04d6ee78beee93df5ea551f27e9e50b5abb38b3cedac9291dfca7b319aa519f9370b680e89560fb32846039ef84db80f110c5e18b9eed219
+DIST udev-214-patches-1.tar.xz 604 SHA256 363d0331d618b8d731ae1db739f62acfd3df503e71afdf50a0b0d33bf78763c6 SHA512 0601ffa8849e14a56d99f69d1bee55d90e02fdd3bef6bc7f2a6e0ea06705e93e5e0c338aff64c6e0eb8dacebbd8e78cc707ffee214592100a9980cfa328a35ea WHIRLPOOL ead57d1f47361d052f5da038a034e8ab3c74f9055c88e9672ba212e00239873f2fcb778a98e2368551443a5a60aece35d00ba10434afe0752d5b4c7654053c39
 EBUILD udev-208-r1.ebuild 15721 SHA256 9edc3beb5c80dab6fe38a5c9225d4fcd6891a35d829ccf2211ca0b233c70d37e SHA512 263868df83ca23637b3d9c2acbc8596e6737faafb6b6352c56445accfc90cfba84183f4807b43c22d41746b87b0f4cbe79c6582e76bcfc7bf678f8d17811c49c WHIRLPOOL 7dbb9438dca92b8f5b3824ba6236249726e794cc6735f73593f8405415774bd413a386bfbda54640870474cb7cbbd6d047d2090d5582e4a57fdd5bba456b792b
 EBUILD udev-212-r1.ebuild 15903 SHA256 4585dcc532c3e5b75fab726e3cb0be0f341cb6a39911b34a1161e8038dd05970 SHA512 26c6bd4a80d7e0a551d776b51578f2ede5e98d4a5e98fbbe620ea0d7bac0fc44c3dae1d26f9e0aebf465566c4dbcaa2872aace624e000f7f0caf95c735317730 WHIRLPOOL 833666c42ac78ac4588f1c2ccbc92507ea414799cd9580c1b7b3a8e9e068bc9ad476397bac82dfbb42f90ace51ff8be65f0dca703bb42f3920c5a95b4e1a61da
 EBUILD udev-213.ebuild 15519 SHA256 e5952891d7b18eecaa86d4ad5758ba796f86fadfdfff1fc396e6bf76e76e3995 SHA512 8bfed0c93b15a62191b812280db77d6c89d1509415dc3e0b77a9fdd796f9f4305fed63871452ec9a4e5e9099adfbf71ab46dd1fb1f09c64a351d90e13a7c0d92 WHIRLPOOL db1b5e53bd28456dc962511e4b467985d021648f018ff9fe54435b8141fe99cfaf12225138352643d6eb8a74c7df382ebf8ac1f013cf44c3fd4d2b0311d667e6
-EBUILD udev-9999.ebuild 15482 SHA256 713923bb30ae3930f63e4c691d0bf245d822becd5900c050205a78f488182d7b SHA512 d55822886b0c7abccd93ca2c7c5982431a1aa5fdc5a60ac456c19e5b1aeabcc7803c6b85dbd7dc38957af8ab255ae82f4efdccde742077f5cc943624ac47ab22 WHIRLPOOL 888f67671105953d7ce8fbe5d92e557e725bc5f291cebca4c1c6f685ca0d8e7dec12392f7260ea17ef9afb781b969c1b2d74d2f22ac82c6b5403ee9ca1c44fe4
-MISC ChangeLog 49871 SHA256 68daf93f95382e1af7ced0cc7d59211c88c39606d029b0859fc720ac1271b42c SHA512 e81c6c2a5a1900b8bfbfe6679204a68e1b5f6dba233aa6185b3710e10d5b496435875704c64d4b9b5c678af904ce87319a847c4f705f083711c6b60b9c862750 WHIRLPOOL ea8ade4b7b230a4a59fb23cb59307f1a17180ef8baab2459c8acc7ab7de8d6f22c9f8b6903fda0cd55a5e108011f55024dd8cb29186cf85fa879e12d38190473
+EBUILD udev-214.ebuild 15480 SHA256 c566e136bbf7172739e9f708a23bf41de140b72dd46e26beb69f2d0bb3bdeafc SHA512 b5648e8899089799a682a664699510575d7a6f3a84bb6ed4553ad472ed0b968aa84066698b41d8984fbbc4ba6744c4afd6327ab701f70e72803b62eea5433452 WHIRLPOOL b8d5d490166a82758c628a536c5aca0d4e5bcfe039f89dc92d1c8d4976bdebe009ab689de9435292a04f7af22cd7f9193100be3bfe97b70f2ead5605e10562dd
+EBUILD udev-9999.ebuild 15482 SHA256 311dd22ce55ae9bda06328644d1bba55bd1a6909941a5e366ee1af20db71bce3 SHA512 b0e06b0a8c78786de49864e15f7e21bb0036184e3d770cb57d6301db08f4e6750cca814061ce24376da5aa1e99f0ad5bb1d1f34b2c4a9949a5507e658f762433 WHIRLPOOL 0f9be35b2f0fb3669ad1786d9ad14132e930432d7a33e953ff91a7718d0d35c5ccfd966135649216917045390f578b026d1115dc764e6bfcf505b58716043da7
+MISC ChangeLog 50089 SHA256 e3c4e663b45f8bb26478f8d9d94a22eb8c8527b852abaca7034d38a7792038da SHA512 e0687e42a4007e26c326606dc54fad3f391a2c83a89c0d1cffe899cd98f1e657c885e734f38fdabfb75e4a2abf01a31432ed4be30fc3e7e893fc4e5434ad094a WHIRLPOOL d66ab29cfde372ba9c64d51b3f55b1d86c7510e90a2740d1fd1ec8d4ca92481f1d9f6011de6fbc701968d31a515f238a4bbd6b4713255818b2c1fad48ca7e4c0
 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)
 
-iQIcBAEBCAAGBQJTlj9yAAoJEPGu1DbS6WIALPYP/3fWOIgExw2vikWMIRe1jI2W
-ep+z6RFazB8p0mqMB/wZI7Fw12CuTxU7/EbS4Dn/m+vl/96XwR/r0yJ/YpdQHvHz
-wEBnaO7QK6oRLvPoV+/yPeSwN2LI/h6MhGBHkZ4yMILfXgpLcEsL5lvz9/NI7/pG
-bMPe3jIXRVSGkMWIg5N5Yex9SarDeofGX5Di1FqV9dehhpDiauOP3iL4bcbDXVYc
-7Ei7cEjMA2rYbkw8IQpFZ9fv6puPUZnyi9oTWDDgvK+WEQtZa1boyLBcuGFzgUAF
-9L0Ep2sbCAHkSZWtpflGWSNo9ljkRLDF/vnpoSRi55X0NL68iFUJmDEtzXmVbe1H
-RrOF0ed6ctI4fNDwGcZwS5Bu/6M7oFFuHxxP4ehLZp3hSsLB/slfgKvREl8tCvYu
-spqUUY1OSBuGs8r7LcK/1FiR/8E5BGuvxbNbYuA1Te6SFgsxijFslYXU35F4D8nE
-mHyxB/KHywa7jBBZqNCSMoHTHWfKG2cTrCTTuncGVUMMuqbtRUnJfJwoNHZNBEqP
-4pbscj0+Pq12OQagFmdDVXRe8D9EkqWlAz1BldfFVL3tEweiTiVxz0RYngwMklDB
-bD9BtIHI0JHa/nDTNTmvhIH3sqYERVDZpLcY+r8dyy44voP3GKkwo8cFHxvxEjqK
-xJaiaLCxIh38SQmkYq8y
-=B8HN
+iQEcBAEBCAAGBQJToa0sAAoJEEdUh39IaPFNL44IAI9oJ01zhNm0QPyidFw93qiN
+IYmD+P5rU4p/K1etsRN4hjcBqdO++uMZG0Qd3s6mKarcmsGCd7VAsR2evhBgk0f/
+nHk775oTKSnVCo3HXJleXy9OPg9zJfXpyg/YI35nsHXRAKPQbgolY98sb+oCBC1L
+ftodCDN4wIHIVvtPbrFO19gGaQNgwFhWmD9JXKpwkgucVDEQ66Iu5NAtcRMUHObc
+j5F0CjMlDBUWqonNV8S5lT20KZQXyIIyAnrR8PUZHM1zeRyhVkiGvsasDXt2Ka7v
+esNylw03FoM8jEbqCyR8jODxQP1xF6yaAJ710fjZf8EbGxfYKMljr1FTmobzjXQ=
+=qbgo
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-214.ebuild b/sys-fs/udev/udev-214.ebuild
new file mode 100644
index 000000000000..ecfe6a1fc78d
--- /dev/null
+++ b/sys-fs/udev/udev-214.ebuild
@@ -0,0 +1,507 @@
+# 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-214.ebuild,v 1.1 2014/06/18 15:19:18 ssuominen Exp $
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils linux-info multilib toolchain-funcs versionator multilib-minimal
+
+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"
+	if [[ -n "${patchset}" ]]; then
+				SRC_URI="${SRC_URI}
+					http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+			fi
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl doc +firmware-loader gudev introspection +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	acl? ( sys-apps/acl )
+	gudev? ( >=dev-libs/glib-2.22[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.38 )
+	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
+		!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.39
+	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
+	DEPEND="${DEPEND}
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+		>=dev-util/intltool-0.50"
+fi
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+S=${WORKDIR}/systemd-${PV}
+
+# The multilib-build.eclass doesn't handle situation where the installed headers
+# are different in ABIs. In this case, we install libgudev headers in native
+# ABI but not for non-native ABI.
+multilib_check_headers() { :; }
+
+check_default_rules() {
+	# Make sure there are no sudden changes to upstream rules file
+	# (more for my own needs than anything else ...)
+	local udev_rules_md5=ec9ab4df735f9213ce182b98bbb19637
+	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
+	MD5=${MD5/  -/}
+	if [[ ${MD5} != ${udev_rules_md5} ]]; then
+		eerror "50-udev-default.rules has been updated, please validate!"
+		eerror "md5sum: ${MD5}"
+		die "50-udev-default.rules has been updated, please validate!"
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
+	linux-info_pkg_setup
+
+	# CONFIG_FHANDLE was introduced by 2.6.39
+	local MINKV=2.6.39
+
+	if kernel_is -lt ${MINKV//./ }; then
+		eerror "Your running kernel is too old to run this version of ${P}"
+		eerror "You need to upgrade kernel at least to ${MINKV}"
+	fi
+}
+
+src_prepare() {
+	if ! [[ ${PV} = 9999* ]]; then
+		# secure_getenv() disable for non-glibc systems wrt bug #443030
+		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 22 ]]; then
+			eerror "The line count for secure_getenv() failed, see bug #443030"
+			die
+		fi
+	fi
+
+	# backport some patches
+	if [[ -n "${patchset}" ]]; then
+		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	fi
+
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific usb group
+	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	# Remove requirements for gettext and intltool wrt bug #443028
+	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
+		sed -i \
+			-e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \
+			-e '/XML::Parser perl module is required for intltool/s|^|:|' \
+			configure || die
+		eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true
+		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
+	fi
+
+	# compile with older versions of gcc #451110
+	version_is_at_least 4.6 $(gcc-version) || \
+		sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h
+
+	# change rules back to group uucp instead of dialout for now wrt #454556
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	# apply user patches
+	epatch_user
+
+	if [[ ! -e configure ]]; then
+		if use doc; then
+			gtkdocize --docdir docs || die "gtkdocize failed"
+		else
+			echo 'EXTRA_DIST =' > docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		check_default_rules
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
+		configure || die
+
+	if ! use elibc_glibc; then #443030
+		echo '#define secure_getenv(x) NULL' >> config.h.in
+		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
+	fi
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}
+		--disable-nls
+		--disable-python-devel
+		--disable-dbus
+		--disable-seccomp
+		--disable-xz
+		--disable-pam
+		--disable-gcrypt
+		--disable-audit
+		--disable-libcryptsetup
+		--disable-qrencode
+		--disable-microhttpd
+		--disable-gnutls
+		--disable-readahead
+		--disable-quotacheck
+		--disable-logind
+		--disable-polkit
+		--disable-myhostname
+		$(use_enable gudev)
+		--enable-split-usr
+		--with-html-dir=/usr/share/doc/${PF}/html
+		--without-python
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootprefix=
+	)
+	# Use pregenerated copies when possible wrt #480924
+	if ! [[ ${PV} = 9999* ]]; then
+		econf_args+=(
+			--disable-manpages
+		)
+	fi
+	if multilib_is_native_abi; then
+		econf_args+=(
+			$(use_enable static-libs static)
+			$(use_enable doc gtk-doc)
+			$(use_enable introspection)
+			$(use_enable acl)
+			$(use_enable kmod)
+			$(use_enable selinux)
+			--with-rootlibdir=/$(get_libdir)
+		)
+	else
+		econf_args+=(
+			--disable-static
+			--disable-gtk-doc
+			--disable-introspection
+			--disable-acl
+			--disable-kmod
+			--disable-selinux
+			--disable-manpages
+			--with-rootlibdir=/usr/$(get_libdir)
+		)
+	fi
+	use firmware-loader && econf_args+=( --with-firmware-path="/lib/firmware/updates:/lib/firmware" )
+
+	ECONF_SOURCE=${S} econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
+	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
+
+	# Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4,
+	# but not everything -- separate building of the binaries as a workaround,
+	# which will force internal libraries required for the helpers to be built
+	# early enough, like eg. libsystemd-shared.la
+	if multilib_is_native_abi; then
+		local lib_targets=( libudev.la )
+		use gudev && lib_targets+=( libgudev-1.0.la )
+		emake "${lib_targets[@]}"
+
+		local exec_targets=(
+			systemd-udevd
+			udevadm
+		)
+		emake "${exec_targets[@]}"
+
+		local helper_targets=(
+			ata_id
+			cdrom_id
+			collect
+			scsi_id
+			v4l_id
+			accelerometer
+			mtd_probe
+		)
+		emake "${helper_targets[@]}"
+
+		if [[ ${PV} = 9999* ]]; then
+			local man_targets=(
+				man/systemd.link.5
+				man/udev.7
+				man/udevadm.8
+				man/systemd-udevd.service.8
+			)
+			emake "${man_targets[@]}"
+		fi
+
+		if use doc; then
+			emake -C docs/libudev
+			use gudev && emake -C docs/gudev
+		fi
+	else
+		local lib_targets=( libudev.la )
+		use gudev && lib_targets+=( libgudev-1.0.la )
+		emake "${lib_targets[@]}"
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		local lib_LTLIBRARIES="libudev.la" \
+			pkgconfiglib_DATA="src/libudev/libudev.pc"
+
+		local targets=(
+			install-libLTLIBRARIES
+			install-includeHEADERS
+			install-libgudev_includeHEADERS
+			install-rootbinPROGRAMS
+			install-rootlibexecPROGRAMS
+			install-udevlibexecPROGRAMS
+			install-dist_udevconfDATA
+			install-dist_udevrulesDATA
+			install-girDATA
+			install-pkgconfiglibDATA
+			install-sharepkgconfigDATA
+			install-typelibsDATA
+			install-dist_docDATA
+			libudev-install-hook
+			install-directories-hook
+			install-dist_bashcompletionDATA
+			install-dist_networkDATA
+		)
+
+		if use gudev; then
+			lib_LTLIBRARIES+=" libgudev-1.0.la"
+			pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
+		fi
+
+		# add final values of variables:
+		targets+=(
+			rootlibexec_PROGRAMS=systemd-udevd
+			rootbin_PROGRAMS=udevadm
+			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+			INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
+					$(sysconfdir)/udev/hwdb.d \
+					$(sysconfdir)/systemd/network'
+			dist_bashcompletion_DATA="shell-completion/bash/udevadm"
+			dist_network_DATA="network/99-default.link"
+		)
+		emake -j1 DESTDIR="${D}" "${targets[@]}"
+
+		if use doc; then
+			emake -C docs/libudev DESTDIR="${D}" install
+			use gudev && emake -C docs/gudev DESTDIR="${D}" install
+		fi
+
+		if [[ ${PV} = 9999* ]]; then
+			doman man/{systemd.link.5,udev.7,udevadm.8,systemd-udevd.service.8}
+		else
+			doman "${S}"/man/{systemd.link.5,udev.7,udevadm.8,systemd-udevd.service.8}
+		fi
+	else
+		local lib_LTLIBRARIES="libudev.la" \
+			pkgconfiglib_DATA="src/libudev/libudev.pc" \
+			include_HEADERS="src/libudev/libudev.h"
+
+		local targets=(
+			install-libLTLIBRARIES
+			install-includeHEADERS
+			install-pkgconfiglibDATA
+		)
+
+		if use gudev; then
+			lib_LTLIBRARIES+=" libgudev-1.0.la"
+			pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
+		fi
+
+		targets+=(
+			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+			include_HEADERS="${include_HEADERS}"
+			)
+		emake -j1 DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc TODO
+
+	prune_libtool_files --all
+	rm -f \
+		"${D}"/lib/udev/rules.d/99-systemd.rules \
+		"${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h}
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+
+	# maintainer note: by not letting the upstream build-sys create the .so
+	# link, you also avoid a parallel make problem
+	mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
+}
+
+pkg_preinst() {
+	local htmldir
+	for htmldir in gudev libudev; do
+		if [[ -d ${ROOT%/}/usr/share/gtk-doc/html/${htmldir} ]]; then
+			rm -rf "${ROOT%/}"/usr/share/gtk-doc/html/${htmldir}
+		fi
+		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
+			dosym ../../doc/${PF}/html/${htmldir} \
+				/usr/share/gtk-doc/html/${htmldir}
+		fi
+	done
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, http://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "http://wiki.gentoo.org/wiki/Udev"
+	elog "http://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	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
+		[[ -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
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+			if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+				return 0
+			fi
+			udevadm control --reload
+		fi
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 661ac38c90a4..9db6b01e4d03 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.301 2014/06/04 19:08:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.302 2014/06/18 15:19:18 ssuominen Exp $
 
 EAPI=5
 
@@ -77,7 +77,7 @@ multilib_check_headers() { :; }
 check_default_rules() {
 	# Make sure there are no sudden changes to upstream rules file
 	# (more for my own needs than anything else ...)
-	local udev_rules_md5=6bd3d421b9b6acd0e2d87ad720d6a389
+	local udev_rules_md5=ec9ab4df735f9213ce182b98bbb19637
 	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
 	MD5=${MD5/  -/}
 	if [[ ${MD5} != ${udev_rules_md5} ]]; then