Version bump. Pass --disable-terminal to avoid external dependencies of libdrm, libevdev, and libxkbcommon. Remove now unused --disable-readahead. This is the first version released with no userspace firmware loader. If you need firmware loader, you must upgrade Linux kernel to minimum of 3.7.

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

4 files changed, 520 insertions, 18 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index fef198ff0b30..d551e0a7d6a3 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,15 @@
 # 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.1098 2014/10/16 13:43:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1099 2014/10/29 04:59:18 ssuominen Exp $
+
+*udev-217 (29 Oct 2014)
+
+  29 Oct 2014; Samuli Suominen <ssuominen@gentoo.org> +udev-217.ebuild,
+  udev-9999.ebuild:
+  Version bump. Pass --disable-terminal to avoid external dependencies of
+  libdrm, libevdev, and libxkbcommon. Remove now unused --disable-readahead.
+  This is the first version released with no userspace firmware loader. If you
+  need firmware loader, you must upgrade Linux kernel to minimum of 3.7.
 
   16 Oct 2014; Mike Frysinger <vapier@gentoo.org> udev-216.ebuild:
   Mark arm64/m68k/s390/sh stable.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index a91aa00cf903..3f398875e2a7 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -3,14 +3,17 @@ Hash: SHA256
 
 DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
+DIST systemd-217.tar.xz 3694524 SHA256 a031e6fbcdc7077b37338bae8074d9428ee2fa98033beb4923a62871890f7498 SHA512 7a0b13330b621ec179499018bfbe9619a91cdbd120ae2067e19cbb9bbc25c80dd0f80aac217d823be1332054439bc9b2153ac78fc1eb231fa0fd55cb3bf7a70f WHIRLPOOL f22674a629b7b928875b6b06b0cffaf5874cdcb90c44787279cd8ff2a798e5bc525c1058f8b2bfe746d100c4d7686e36a6f604276d5735f7554122e4caad6689
 DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
 DIST udev-216-patches-2.tar.xz 1264 SHA256 18b7b8f852f11c2ac2a58458462ce686ebec48859562df99c5b9c29c95ddfa3c SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 WHIRLPOOL 8f93f982de2d1fa10f7e3c6541c559f2c881730276498b14d4d27b8577bdb340d49b2dc7a50a40e8a13fcabbbabb3dfa5f1605aa842e325d12c17e82d2dc787b
 DIST udev-216-patches-4.tar.xz 1648 SHA256 e313f33ca122dbfc44e09ae03f938e1907f0679bfd025861da3ead0c4f0bae33 SHA512 4197975e105b8e35de763f684c8b29130beb34624dc7e5722a4494e1e0b2d1ed4ffdb89900885af254a805719aadac124f4d696e1f3a59f17145078834195ae4 WHIRLPOOL 4519476802e35e7771e5d4cbe6f8ee50924fd7e3ff7a580524c76c81d34edf919fb401804ee963f2710c83ec1cf6a6949df8001a8f414c2fb9773aba12822dfe
+DIST udev-217-patches-1.tar.xz 616 SHA256 80c0e57caa2845164b3fda1a9a74d07763a6b18e55c6e1ec60c0d888cdf24cf8 SHA512 e0ffd9c515c79da30b51448f1a78f6cc442ca595dd0bcd0f766fee31fd1324af6b820238ab342c8e40d6953ce17b872344deb0e7d1803830952d7dcc6f3479cd WHIRLPOOL a4e28fdae7b67fcd65a2d0fbf7e080e9dde6b4cdaacaa845d2bffc26717aa8f7a498fc0e6ad6edf8a553759a0f4b4ddb5da768211b294a1b37a21eecc225cf10
 EBUILD udev-208-r1.ebuild 15723 SHA256 7f5b0e87086b1da86237795ebf699d3b9fb75ded1dc7f7c94973909d2d41604e SHA512 284028c7054b53e0ebf0e57a70a020fb4e0442e024703a955f48678b9064a7a04a2a3f433e4c35cabb8017b93d20798115bd1411733de6dedb119a8edcceaa4c WHIRLPOOL b62db1c1716c83fc392fb9869bb4ed55ece6c99f464ec945eb35d33022d9a37aa7ac493a2d120dc6a866ac550e7cc5c448dba63f5c25f1aa2f47e36d383b5e0d
 EBUILD udev-216-r1.ebuild 15804 SHA256 42e0b9273b1c41ddc2720974c57a8ca010ec1822ef51938d5c90ca196c66d0a3 SHA512 07fda2595a52bf64db60839fe18e20a67659d154c252073dbb959a00c8d836952d52fde8b1007b91b80345b24754151fee40388a986f70e1e10d357f2bd3a903 WHIRLPOOL 63ff43f651e44598c6967f913225550bfac48edc8782c8a3a8ef17316c982df03f9cc564e2f8e93c81f0bae8469d7e31e2018bca7602a031b93837d2a9386a41
 EBUILD udev-216.ebuild 15281 SHA256 63162c6aa71ac5ad17782d99ca9d0124533b9719105caf0ff18fed8824478a0c SHA512 979a4bf51b1dd97039a302302940e23e11da12137d17b55d90819d23aa31081f581ad25c0dba62f9a9f0ad3232fbb462999a8172e3c91bab59d73c3261335090 WHIRLPOOL 29269d0a640a3b7d5d2dab273305a99a133cd75cae76f4b6d213f03c52133cb10f0bc582a8d3f6adad8e30cdad4f23883e5567d964e39dd5084c579fad05fd0e
-EBUILD udev-9999.ebuild 15528 SHA256 1aa366bb2ba88464864320e0f6c2f92a524b40d16ab9b374d73d2f301cd114a1 SHA512 cc1ee5b65cb9292b07b6d2f3cbeed53c4590ea618d4dd902a806fde6200b389999ae2090859d0e0b88880b1fe474a16796acccf728d70386e975689d73f0a480 WHIRLPOOL f3b7248a572f00be54104816a399e348d3b3fa609a079e0aef0a15bed2dc4dfb6f48bf2c62d45fe0a1feeef89699484c1503d0a9853bf8f2b698a433a1b4a264
-MISC ChangeLog 59360 SHA256 1a823578713d9966a83115b94640a63e6b5694ae1c62d54295a5f4493fc4ca4f SHA512 287fe3ed8a2db680785ffbe9f4e95f45c84012f18e175528eab28ca2befd3da3e497a1d0a2143624732b6eac8a10d11b998e30c60738268f6df46c8c41ba443f WHIRLPOOL aa5a2e4f23195dba9e4742df045b4aa2f1f68bf3cb4b6d9d3d44defd40939557e5be2391a93e2f5f0030d8a6febde0e6a798820b062420d5e7e68594f0c39057
+EBUILD udev-217.ebuild 15525 SHA256 eb920670604de6cd456d71abbbe7d15f7210432f72f6845351fe44a9aa912ab5 SHA512 61af397ee313f26c82e0b7768108050b970284d49b2fe0b54c401b7d73427e9701bb601f7becf5474c3db32c6b67ff497f3bc9ea9dc9985325c925b29789b840 WHIRLPOOL 023cc643d9f99331d6568d387a187f73a6765f8d3490b47a541334524a4692c812590dfd6ecf41fd087c33f684083e0aa01f1897e9809810e08a1ca4bf58e2d8
+EBUILD udev-9999.ebuild 15527 SHA256 806659de0362615cb008d964693bbc5115b2433d0d9a848b60609ac0fbfbf095 SHA512 03b82eeb6ac25d81ebd1357b78e132639055b2043430400e341efb4beda6790147848b1c623aa2e2a1d906022e180526f163a77d0c95e628b370a3639d3d7d1f WHIRLPOOL 23fa3a1e7aadd89b111c72b7cefbc686c9865c61a89d3b5dfe99df103f226a312989143b2bf79ab5d35f5bf074af2a8379c1e9c9d3ba93fc01af53727cc26ccf
+MISC ChangeLog 59784 SHA256 b69b5f0b97d228a984bd0200b33ab8280fbc7c6696a7fca83f0f4e56b62eb804 SHA512 afa139162cdb109d4476e08f9ec91099e1ce08513d5d2c9a10b36d682547c0639e480c785d0f93157592b9c5a5b8c478c6032ef0e1a25cefa35057f7b5b35252 WHIRLPOOL fd22ef14439594b8940b76c386ea17dee32a9339df930a3b1b3e1b98dfc1f70e1373970e3754626e134517052d55ae31883338c533fdc2e7f7fd1ac186ee3b46
 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
@@ -19,17 +22,11 @@ MISC metadata.xml 610 SHA256 5483522dfe99f75e0f48a38a03338037f8229e8dbdb4b94aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUP8uKAAoJEPGu1DbS6WIAes8P/itso2rAXO06mKpQUYB1nriu
-we2Z1qPxTazbTMH6gQ+ZamzrFzRnmCFHSNzVHNn4XyZ48Z7hXGSIzvsZ/0bkJt2q
-P64YyxD8Ghrk9U9+jO1WT/APMh+J/xmF1tgHnqqASMmCYPWjR+vA5GRkbJvGxLY2
-l5B9zercEXouvrGri5ee1GBSkrRXy5YJN7vDPdBrOLmbqqZxdNBKSE15K7d0Ba2T
-E/fY441RCrJfZ5t5PKFnqHuLh19oyNlWQVZr6DOg9zmyyxJCJ6L+QdbAKl8U8/p0
-vQhobi3m78OTxAAORfaR7uKI1s8fF6TUhBbCCcALNsiAs2B8LF8IQm3eSrB+LFOW
-4zB5UVkC0ac0QBkuDoCIHz412sUZYwntk8V4b02US47iUOpJIBENf2r+6lqwtr4N
-zmt2SxymHVgKFG10iGCr+DSbV8cMR5bshWeN+mGrSSqebbgAaDBxeDZK2oTJW0Jr
-SuW8CtD9sU1TBq1erF7GzkSDiq4ucePrYa5VA6gbTvE9yp5xR+ERxSe+6WNDn5le
-PIeCb0tt5sq0owRn9xCRhKfstW/KG3TA3v1O7x6OC3Mn50rY/XH5SWSuxjMiGqV8
-iRUME9p2QMSq4O4DV0L6E5tqrliO8S/laATozZBDVEJzc4sIqGt7b5az9Z4L7mUv
-LVPxukKSe2d1CE4UhitE
-=InCc
+iQEcBAEBCAAGBQJUUHQFAAoJEEdUh39IaPFNw38H/08AEVYOi2ZbBtti+vQ9AZlq
+gx4Vs63gNnlTy5QQPJdeNVYc2+bhl83Fld94vexzAuaiJCY1F9hii/uNjiC+fERq
+dKh0cRhG/1vVH8X0QLLqDeYhDn1YD73I9bBis7y4kPCG/Y1VWA7J9sOJYQUWwJc4
+bhkpMcILY/0YdahgfegUceS6wu1//bRNpZKwphe8O73nQvhRq+ojw/zAZ1aMF8+5
+lU58n/TC7iEucJ5qqMw4ARu0tqt8b2Uyv18tEhZkkswTr5csVazbe4FuRPEGPVwG
+ieADVLC6h7B/vObgWbbsimqvwGG0pVHJYDdOY/c2/CYI5TH2qF6wv/+q5KlzDG4=
+=c2ww
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-217.ebuild b/sys-fs/udev/udev-217.ebuild
new file mode 100644
index 000000000000..b25415b8b31e
--- /dev/null
+++ b/sys-fs/udev/udev-217.ebuild
@@ -0,0 +1,496 @@
+# 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-217.ebuild,v 1.1 2014/10/29 04:59:18 ssuominen Exp $
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator
+
+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 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.34.3[${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-apps/coreutils-8.16
+	sys-libs/libcap
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-3.7
+	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"
+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=c18b74c4f8bf4a397ee667ee419f3a8e
+	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() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER"
+		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
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	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 28 ]]; 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 floppy and usb groups
+	SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	# 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}
+		$(multilib_native_use_enable static-libs static)
+		--disable-nls
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable introspection)
+		--disable-python-devel
+		--disable-dbus
+		$(multilib_native_use_enable kmod)
+		--disable-seccomp
+		$(multilib_native_use_enable selinux)
+		--disable-xz
+		--disable-lz4
+		--disable-pam
+		$(multilib_native_use_enable acl)
+		--disable-gcrypt
+		--disable-audit
+		--disable-libcryptsetup
+		--disable-qrencode
+		--disable-microhttpd
+		--disable-gnutls
+		--disable-libcurl
+		--disable-libidn
+		--disable-quotacheck
+		--disable-logind
+		--disable-polkit
+		--disable-terminal
+		--disable-myhostname
+		$(use_enable gudev)
+		$(multilib_is_native_abi || echo "--disable-manpages")
+		--enable-split-usr
+		--with-html-dir=/usr/share/doc/${PF}/html
+		--without-python
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootprefix=
+		$(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)")
+	)
+
+	# Use pregenerated copies when possible wrt #480924
+	[[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages )
+
+	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/udev.conf.5
+				man/systemd.link.5
+				man/udev.7
+				man/systemd-udevd.service.8
+				man/udevadm.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/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+		else
+			doman "${S}"/man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.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
+
+	if ! [[ ${PV} = 9999* ]]; then
+		insinto /usr/share/doc/${PF}/html/gudev
+		doins "${S}"/docs/gudev/html/*
+
+		insinto /usr/share/doc/${PF}/html/libudev
+		doins "${S}"/docs/libudev/html/*
+	fi
+}
+
+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
+
+	# http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# http://bugs.gentoo.org/246847
+	# http://bugs.gentoo.org/514174
+	enewgroup input
+
+	# 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
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index fdfaaf081898..20ea1743396a 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.321 2014/10/15 16:30:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.322 2014/10/29 04:59:18 ssuominen Exp $
 
 EAPI=5
 
@@ -189,10 +189,10 @@ multilib_src_configure() {
 		--disable-gnutls
 		--disable-libcurl
 		--disable-libidn
-		--disable-readahead
 		--disable-quotacheck
 		--disable-logind
 		--disable-polkit
+		--disable-terminal
 		--disable-myhostname
 		$(use_enable gudev)
 		$(multilib_is_native_abi || echo "--disable-manpages")