version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

4 files changed, 461 insertions, 75 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 32b7b780240e..33f5ea37a92c 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1120 2015/07/24 14:12:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1121 2015/08/02 17:47:09 williamh Exp $
+
+*udev-224 (02 Aug 2015)
+
+  02 Aug 2015; William Hubbs <williamh@gentoo.org> +udev-224.ebuild,
+  udev-9999.ebuild:
+  version bump
 
   24 Jul 2015; Alexis Ballier <aballier@gentoo.org> udev-222.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 19a142fa4d07..e7dc443ce8d1 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -15,6 +15,7 @@ DIST udev-220-patches-1.tar.xz 1760 SHA256 ac2e778776db9dc13d431b871d5b67aad378b
 DIST udev-220-patches-3.tar.xz 2812 SHA256 885e3f4a52e7f178272da5591d22baf87954d2c8e6fed188193deff493b0ab13 SHA512 15a5bbd3f4ac95d14ffc7c95cd2494b4d74cfd95674f3b0ac3ed9ae955e88a026ad9be82e9229aaf81a2ac9649411aa178fccba2beee688f287e925a8bf3057c WHIRLPOOL 3f1f24eddb80d29da4cba0a32dd8697a9a1f7fc45c00207effe5d944f8ad4c09aae86c0d45dc7af560f42ccdecf0cd69267c46ddd853123bfcae202c5bd90d75
 DIST udev-220-patches-4.tar.xz 3432 SHA256 b17c676c7984d90bcafb57d087e77bc9e435a3244187f51e8c5ce1b3d4248ac9 SHA512 747e6d36faaed145bbe630e794bdd636d4e39d55fc2fc422d815cee3ab4aa579f15abbd1ff88c0448667546c8b04f72663cffa46d07861199076912bd009d25d WHIRLPOOL 0a349daae71b6ac95afc7414aa931f8aaa7328d2a0e7058cf6099b794531a1148bcd198f404d5d4bab7b250b1390adeb6938e8771da90fb7f56114560fd03a82
 DIST udev-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
+DIST udev-224.tar.gz 3868075 SHA256 0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512 7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85ffffa7adafc9c0c0b94fd93784510792109240e22e6b963f198 WHIRLPOOL 645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
 EBUILD udev-208-r1.ebuild 15755 SHA256 213b2d12e016f6ee92703be1feb672b4077483aea7f2ff1b77a1bd96f6111e8f SHA512 08010a5cb9957978521f7a63d84acd9f727c70db5f865d73f1def5f4ca0093db17e210d32570079e63e9b42215fabd3f3b64665bd47f79837e939ccf6e8b554d WHIRLPOOL 3dd87881c67fae3e1cb866b3f28854e4316a7c5b1d9362801c4ea267740876e247bfb4d95019057d78025a84a6fa2f942b76409a2baa0c7f9313f0babc0a149b
 EBUILD udev-216.ebuild 15313 SHA256 7551bd46987fa8030dd89675b2d821cd868af9037d5e6b7e9458729a63d37fbc SHA512 64305d912001c0aa6298b033e913037fc720d080ba56d984e6134327c240bdef61a9094c446b9a0b2bd96a882d9a2df53e40262701bebb54adad3020af06d04d WHIRLPOOL 0d66063f0d1a298a102247e2dbce728e326597349c13f85a05e19e541203e7b6628ac91d95d02fbb6a4b335f7fefe262eae1670435513232ca74f6dc2a246188
 EBUILD udev-217.ebuild 15554 SHA256 cb3d882ec4cc8910fc4f8caf149903e4ff8d8e4f90368b40ad6b31d3a30cfeb0 SHA512 28335b988f562130fa4878dab8134243baf635caf2d07a1d33374cf3ca771f6ad87c31c938bec26dfc8ebb8030d010f5221f6ec2ff95a39ef046ed0214fe552e WHIRLPOOL dc6d6ea69ee22a0133450139e65fcc0e3547025fa69ee5f26ceb2dffb1952a4162c42c16dbf5a3d5fab0303f2aababf834b2cda1ac7de7be95ec51bb45f02a8c
@@ -24,29 +25,18 @@ EBUILD udev-220-r1.ebuild 15793 SHA256 8fb809d0861408b956bd9376ed3c3ae5aa114933c
 EBUILD udev-220-r2.ebuild 15794 SHA256 4c3e0804ad6cd3faec252f9b1d1b55724ebd791b6832ca73670d8e10bbb2ae96 SHA512 1cfbc253411a9a16e24bdfce6e652ad48656976248797c3096a6f69df7af0e9c341024d61ee893b63255d35d2d1fc324d6c0da7d0a0b0d785b443a13dd2b46ab WHIRLPOOL 14a6c7742b152af3adaa2a8c070d3750be6372c1a3a68f292372711bd43a8a352531e787c8754bc8eea4c5633e444677c757f9e0123c93361bba7f61bcee95a1
 EBUILD udev-220-r3.ebuild 15794 SHA256 2fb0aaf8da8c887308de3fd121418557ca9fa52a2d991830f89c3b41954a9f05 SHA512 9b4ce896300ab7be9cf0f80ccefa2a80448ac2fc24a3d286cc1bc9fb9b6cecd6412dc1df23cde4bbbf796cc363fbe83972cf47c1b060481af436fe3d91b6e4b0 WHIRLPOOL 70c4e170873c65b76fcef8d2f17ec37e2e20e92769bba357ba76619a92d26b1f42fcb49ab875574943cb36dbe697f7fb94a1da6f48156fb9a15f7328c4ce3acb
 EBUILD udev-222.ebuild 13787 SHA256 1f6d4e8b9ab17d9312735b1f6f1bb80a835fcc529fc427a17e7ff6a70709a949 SHA512 9bdc32fd30ac8362c30c39fdc556e3234a2c459c47267e3b3f5387a496e61c2b52e12749315b6fccdd07807ea4a79ee91b42f9f2214dedc510ff6fea17755367 WHIRLPOOL e72b938e059117a123df0769907dadd0eb0f90dc5b83798ebb80b345b55f0f28d2a9faa9f30e00386d8742a71e6ddcca898c19638bc8e0dfb061da570b608cf3
-EBUILD udev-9999.ebuild 14814 SHA256 f329a78711584c9ac0b1a2cb50287c3ee3aa6124d43f4fbc6d5f07eba9ec9785 SHA512 6c10b613c761a1fd1e3f999b8c533d462983434d8c702923145188ed5b947ba2c2045de10570d5ba784fac77c7176de5e6263fa19ff67c945d8be916ec900730 WHIRLPOOL 4ff90e01be40b714141aed8d1f2751c36ee0ab4223e932a6f22457a4ad2401abd547e456013daf2edc028218633bc6d6700174dc61628dd6f56447001bc00053
-MISC ChangeLog 62683 SHA256 e4e4c16005f96e08017c6392475d29458ce40657939600b4f64dab6ebad733c0 SHA512 5590af95096deef27c9f626eb644eb7ad23b3de24f40aba8543e9a1ef341b10eb96ece6f29f752a673f5b5cc81a9c129e2b38b53238c1231932eff9edb3f38b6 WHIRLPOOL 9a025004b3fcb9715633166fd910cf7a1e83826fe5b990e48000022ca1a10368e28a3f1e768887a8adc414b103005c745a602d73aac5d5bbcc54e30ff4d40300
+EBUILD udev-224.ebuild 13741 SHA256 dc3222b8b7c6ad1f43c7782467b6fe43c21e51ff69851659e3dab77dab65df87 SHA512 fb80b43a7b0de500b06fcb2a3e46ea0fd035cd2d70f8667bddd142f44f123e9397523ed15d37de08a0a45316882dce5c1d57044ea257cc83bce1a0eb42a70a91 WHIRLPOOL a592e08a24a27b0305ee68594dbdb51209aad04e88b1b6de91a9b6ce45300a380574318455ae1d91b5feec6074e61f8a26f94d36894c1ed1f7809b97ac33d1a2
+EBUILD udev-9999.ebuild 13744 SHA256 53e1da674f8143ddb49af8f95b6e71924fce5ee9d939754fd38bfe72f8c5be92 SHA512 d7ab6989eafd9898c8040edc8f3166a5187a538d4ca835a1dcbfc1d0e490b0ed575083f83ef22cc6f20a4d303b6a9336ef3970f0873ba238ae39b1599a6678ed WHIRLPOOL 39bbdaf4ba9b2d3725431ea06a2e850d79002a5c963ca39a2c264d8761274d737c03efe8b64eb150395c95b692f63d80bb180f205a9cec2a896967e8b05dacca
+MISC ChangeLog 62813 SHA256 37450fd0c56453744f0db76a9d517168aafb39c5fdda58f097c58184ecc3885d SHA512 27316fc6d1eb4bb701ab03f36e426d960d8ff78c96a0d0f99a80d6e30f728f85f5faaa02e9166f566245d82b616a3d699fecef66a5c7f9affdbdf4e20384cc21 WHIRLPOOL 92c2d292e48ef211e148a09b4cddef6c583913e3d1b9077e35f2848472b3f1685b3d8b9e5fa213003dc56f1dcd91d4622e4982ac151ad15c3d42ebfd47a4ba09
 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 665 SHA256 59f3366f6f328e293262ed7a8d272f99b4394595b16ec124e60bf83bed477d6e SHA512 ce238318d09a81d124dd801be45e40a11c0091b1d270d75735ca6f97f64af73933f7d68d70952e2b9673aab8a8341284f987077c411507e3752855d30927ccc7 WHIRLPOOL de4bf570d693cddd6b2e2a1d407d0ed70b4705487e7ea5c10aaaa37bc290280be80631ea84ff18dedd4695a20f77501b9f6b8c8b6fde7fdddb49bd61bdca0925
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVthDbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiL3kP/0iXDA9pdrknf2csabRhO+lG
-Vc8DZZJkyYVYFt4fdRboyulVzyyNRRm5aEmMYSB1K9ijlxnwYc+r8c/RALYlXeMY
-bqzdWjobNTWQhnrx1yT/nfT+QJRLP9+b4ug4NK7rGVVtYkdsR8rFlzc/cII+cigS
-svrAfggZj1OAgItImEjR719UhJJOrXheihN38Nx9MIlS+T8i033pyRjWRY3d2G0k
-Tjju5sfhamzgOTSoSTHJkNOiCq+Yl2urzmPaYpFnZn15wdI8zC1WYgsL4p2NqCqx
-JI+6Y4MCgmDHsgOiYfa+zYTxNOK+xh/FlEnEIqulCAe6jjaQiHaWB8JhYRcx9ZHD
-vZaMPiIQ0MNoiNNv29rokXG9OKOgdWVn9N1JlSsU+rXRAraKfGv4qF5N0WOUU8te
-Hgy0r9d67Q9XWgizVM99n80vtw38R4pbdLl2n7gb0QXJpwYULQrIyvo+MKRmO1Tg
-Q/OlbewZP6hdfs+Gt/y28qMbiEtFRpvOhh8msWmitFhmK2x0NX7U1BFA+MNB/83D
-IfxtDXIa8A8pUhQseeVA5wjyN/xmqXYXmd9s4piGrsppM0PplLoerSLNMTo9bDjz
-RmQB+nrrvSq2ycSn1LIq3K8gKobOf/0q2Y6Kg2WC8ANSYivVRAIuUQU2xpJujqWW
-RzukJ/dX3AYArx9OCRKa
-=WMZJ
+iEYEAREIAAYFAlW+V6UACgkQblQW9DDEZTh3ZQCfR2jykA6O3jX6FfxZ9YlWS2AO
+fKAAmwS4bJXIi2T3j/uK5yoMCj0W0A7C
+=RjHu
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-224.ebuild b/sys-fs/udev/udev-224.ebuild
new file mode 100644
index 000000000000..82ff1a8460c4
--- /dev/null
+++ b/sys-fs/udev/udev-224.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-224.ebuild,v 1.1 2015/08/02 17:47:09 williamh 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-r3
+else
+	patchset=
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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 +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.24
+	acl? ( sys-apps/acl )
+	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
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-libs/libcap
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-3.9
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+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=b8ad860dccae0ca51656b33c405ea2ca
+	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 25 ]]; 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
+
+	# stub out the am_path_libcrypt function
+	echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4
+
+	# apply user patches
+	epatch_user
+
+	eautoreconf
+
+	if ! [[ ${PV} = 9999* ]]; then
+		check_default_rules
+	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
+	export cc_cv_CFLAGS__Werror_shadow=no #554454
+
+	# 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
+		--disable-dbus
+		$(multilib_native_use_enable kmod)
+		--disable-xkbcommon
+		--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-gnuefi
+		--disable-gnutls
+		--disable-libcurl
+		--disable-libidn
+		--disable-quotacheck
+		--disable-logind
+		--disable-polkit
+		--disable-myhostname
+		$(multilib_is_native_abi || echo "--disable-manpages")
+		--enable-split-usr
+		--without-python
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootprefix=
+		$(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)")
+	)
+
+	if ! multilib_is_native_abi; then
+		econf_args+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	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 )
+		emake "${lib_targets[@]}"
+
+		local exec_targets=(
+			systemd-udevd
+			udevadm
+		)
+		emake "${exec_targets[@]}"
+
+		local helper_targets=(
+			ata_id
+			cdrom_id
+			collect
+			scsi_id
+			v4l_id
+			mtd_probe
+		)
+		emake "${helper_targets[@]}"
+
+		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[@]}"
+	else
+		local lib_targets=( libudev.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-rootbinPROGRAMS
+			install-rootlibexecPROGRAMS
+			install-udevlibexecPROGRAMS
+			install-dist_udevconfDATA
+			install-dist_udevrulesDATA
+			install-pkgconfiglibDATA
+			install-pkgconfigdataDATA
+			install-dist_docDATA
+			libudev-install-hook
+			install-directories-hook
+			install-dist_bashcompletionDATA
+			install-dist_networkDATA
+		)
+
+		# add final values of variables:
+		targets+=(
+			rootlibexec_PROGRAMS=systemd-udevd
+			rootbin_PROGRAMS=udevadm
+			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+			pkgconfigdata_DATA="src/udev/udev.pc"
+			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[@]}"
+		doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+	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
+		)
+
+		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_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 c77af69dc80a..94351399722a 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.333 2015/07/24 14:12:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.334 2015/08/02 17:47:09 williamh Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl doc +kmod selinux static-libs"
+IUSE="acl +kmod selinux static-libs"
 
 RESTRICT="test"
 
@@ -104,7 +104,7 @@ pkg_setup() {
 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
+		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 25 ]]; then
 			eerror "The line count for secure_getenv() failed, see bug #443030"
 			die
 		fi
@@ -161,8 +161,6 @@ multilib_src_configure() {
 		--docdir=/usr/share/doc/${PF}
 		$(multilib_native_use_enable static-libs static)
 		--disable-nls
-		$(multilib_native_use_enable doc gtk-doc)
-		--disable-python-devel
 		--disable-dbus
 		$(multilib_native_use_enable kmod)
 		--disable-xkbcommon
@@ -184,11 +182,9 @@ multilib_src_configure() {
 		--disable-quotacheck
 		--disable-logind
 		--disable-polkit
-		--disable-terminal
 		--disable-myhostname
 		$(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=
@@ -201,9 +197,6 @@ multilib_src_configure() {
 		)
 	fi
 
-	# Use pregenerated copies when possible wrt #480924
-	[[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages )
-
 	ECONF_SOURCE=${S} econf "${econf_args[@]}"
 }
 
@@ -231,25 +224,18 @@ multilib_src_compile() {
 			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
-		fi
+		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[@]}"
 	else
 		local lib_targets=( libudev.la )
 		emake "${lib_targets[@]}"
@@ -269,10 +255,8 @@ multilib_src_install() {
 			install-udevlibexecPROGRAMS
 			install-dist_udevconfDATA
 			install-dist_udevrulesDATA
-			install-girDATA
 			install-pkgconfiglibDATA
 			install-pkgconfigdataDATA
-			install-typelibsDATA
 			install-dist_docDATA
 			libudev-install-hook
 			install-directories-hook
@@ -294,16 +278,7 @@ multilib_src_install() {
 			dist_network_DATA="network/99-default.link"
 		)
 		emake -j1 DESTDIR="${D}" "${targets[@]}"
-
-		if use doc; then
-			emake -C docs/libudev 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
+		doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
 	else
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc" \
@@ -339,24 +314,6 @@ multilib_src_install_all() {
 	# 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/libudev
-		doins "${S}"/docs/libudev/html/*
-	fi
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in 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() {