Version bump to 1.7 = 213

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

4 files changed, 294 insertions, 23 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 280c71e5a842..1cf7c74c76c2 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.111 2014/05/26 22:00:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.112 2014/06/01 18:29:22 blueness Exp $
+
+*eudev-1.7 (01 Jun 2014)
+
+  01 Jun 2014; Anthony G. Basile <blueness@gentoo.org> +eudev-1.7.ebuild,
+  eudev-9999.ebuild:
+  Version bump to 1.7 = 213
 
   26 May 2014; Anthony G. Basile <blueness@gentoo.org> eudev-1.5.3-r1.ebuild:
   Stable on ppc64, bug #506078
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index b0c6f5ac6d25..891f74adbcdd 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -10,28 +10,30 @@ DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6
 DIST eudev-1.4.tar.gz 1712371 SHA256 66da90fdd228444b7ac1868d36f1c0fe52476b966e766398bac7448e105c9f53 SHA512 5be490b3c29ae26c22f9dcf60df26e599ab4dd2841cccadd8bf204f6e6d8103e689708ab0ad484c30ba656c3a693f594fb38cd2eef3b4ece8727bdbeaf8dd4d4 WHIRLPOOL 3f448d1b87253f17c35c9268739fa3d01660192956d70d23c5ed3bbb983ecefb39cf193f8658019ecefce81706667022eaa0170cc6ba3a624fbeca9e148ac839
 DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5
 DIST eudev-1.6.tar.gz 1729499 SHA256 9d00d6925ccc7763be89472c5058012bd45ce13f14297e40e4cf3a02244a6a47 SHA512 036cb1f43447fd938f0ee93b03cb4cf2ff1e1e5adab6aeb042ef99b791d887165d15206fdb3a11f3b71ce0e3affaa446193da1574c3fc3d3495f6bc057c37927 WHIRLPOOL 31a106e57060987a1f67aebb35a459ef103743365265e973f306868b72f7a7ff024b0ab6af684e2495a90e41e87147b2a0ccfaa12a09e9e21d0aefa6068e0a63
+DIST eudev-1.7.tar.gz 1755909 SHA256 7c4186904a87e553ec731458478e53a2bed97331e6ba215c4c480a8e2e6e1930 SHA512 dc7e2a9468dd65da6a2ef3c5b8599df2d3cdc0ca872a6af44557f9d572128d6e7a937f714a89d8d0ed495e5fdd9372a9632716add57bdc2655d9df568c36af2c WHIRLPOOL 796192b3feb72563d6da24717cac92ecf2da7bbdd54f3916729e36fc9e4bb09feecfa27d1e7bec45e32553cd7223f784efa454914a132ea77a0aac5c50056a2d
 EBUILD eudev-1.3.ebuild 7910 SHA256 c859ec0746f5dcd792ec12a0c9403ea04450b775c210f2c9f57d7d350f094fcc SHA512 3017a5fa2e1af8f242aee15989615f8f50bf88060353092ccef02d2b3135d5848c8efc89dc9a89914e801a3442d06b0e0a3219be5407623e39073c81571f1d4c WHIRLPOOL 4ec4ba4da39a55e4c59085b69278bdba395c46044ca3dd6cd618f8f07bbb047d41dc72f20c459a95625dbd8a6811985bed248c6dfa76a9d1825ecd133d4f7799
 EBUILD eudev-1.4-r1.ebuild 7922 SHA256 ec3bbb695fc2fa5f776eba5d1fc1e68d5e3267794d9503fd7a54511eeb36eb1e SHA512 460d4ff06f996b129e5007401edd3a97fb47ca7cb02741127b724bcafc97ab7c9eb7833e9c75cafbeb3fd785e333f74bd311295a945e13fde78cc5c0e9ee5703 WHIRLPOOL 333d1b3cd1d5e18c9828327362d2578462019010f039fc7c8655647dd1f1b9c3b16464661c55d16f8023f29e0dd123c12ecacf9cca6a718ef744848e3686a3a2
 EBUILD eudev-1.5.3-r1.ebuild 8119 SHA256 48ffe4a2a3da43ad95229563251b55ed467b16d14543a7adae671857f4babf18 SHA512 2418a01fff03c4ae52e950130e7e0910bf1048b7be637e85c8f20a04a6476815bc5713cab655d8ec8ed9c8de258dca96f9e1ece93b21512b061e62c75f368eab WHIRLPOOL 1bbca8a1832d5cb418af9ed103814ff1848c005e807c36dd11c90ad53afc51bdadb029bbc096ca65ea36a104af8eba0bc3f525470354ef0a5d60badc6b246e3b
 EBUILD eudev-1.5.3.ebuild 7921 SHA256 87fec8fcabc597df1f31f1373521c4c08704ca0d33cc1aa93cf1377dfd04909d SHA512 13522474dcc411dd7281d219d870065f327bff0ba78b480dce06e99820789960898c2a06610059c405fbd991b97d28a35d400e8d6a0e5ca10b216524555f63bc WHIRLPOOL 47bacb467bcede11b25fed728357fd3bbc1fb9d1eb2fcd2ffd97b6ebe403639e571be99d33e23d06d4eae037e925287a377b046f292a8fcf3d7e18ff0550a7e7
 EBUILD eudev-1.6.ebuild 8257 SHA256 dc33975cf3734dafb4355fb530cb8883cdf1ed9b2885f9057d690551e28af0bb SHA512 b21619443dc4e5046fd75057352b79b8c5c6b9e5757a4cad0fd3cfdbc44359098e95e5841b182b789e7a0ed1f039f4af9be0cf95a62499722fb1eff51b06c106 WHIRLPOOL 98b597fda9c467da3a302f2e47fb50c9020cedad2ba6efb0debe16f5b4e6db75cce9f19a0c48e7ab8a20f2da2782a6fa790402771dc35984305945c4263ac35d
-EBUILD eudev-9999.ebuild 8259 SHA256 532dcd069d26a34371602f46e7f70fee7c5c70dd4713a1da417faeb55d764308 SHA512 dfc7b863dbe88d5bff75d51dd1b562e96649a7b3c580e34eefd9aa5eb00b89ef0d1fdd3927a89005a329339e35558ec52f5a9192c0c3095370908b4f046287aa WHIRLPOOL e6ee8d4eb1cec323db067826d0d81db6d81fb7be60aafcbbbf9d3410c1cb3ac4d758d05a1f4ac01c650c60fcee023c0f5518949dcbf0bf4eb44de0f6dcab674a
-MISC ChangeLog 16835 SHA256 36b4d7dbbf790c384a0d34014edbc7a2ce67e2c316f10b7ed170110cefe89302 SHA512 b5b60f385d2dea57adc123fa1ad2fce40afdc3313aba148b3f026570d988610d0f9d24009bb8ba6afe4c3dee1a95524d0d4d5e60f0835bbccbe83ce2eddbd9c8 WHIRLPOOL dc30f1db714c9710a5919f50cee7c1ba5091ea0cdb52043ab52a0856f642415ccb06c31dbb525e6fc7661d8d8c8414fb57cc431e2ad3ed6d0866a879e4bb51a8
+EBUILD eudev-1.7.ebuild 8198 SHA256 996bac8c8d691aa4e11ced64960118f2d5784425e07c739bdda5406b764d2a50 SHA512 3b25efcd8fab09f69bf49fd6591dc2e8a3ca05f721fda44ffca70cf8fec11be96aba962b22024c90f68381b6af2ada70f5365aa2d74b2df3eccd8270b508d499 WHIRLPOOL 697d5a0cf02220f6de5159fd004708e324d7a10fdc4d765583444a0df54a258827f9247d79500d550b870a90212ad08233fe8a8ebc690c457f16bda96d02ca98
+EBUILD eudev-9999.ebuild 8200 SHA256 4aaafe125588e8cfd6fd1f2ccbceeda54c784598d2bdb28a6f81c30fefcb75ef SHA512 097d15a56c9ad9f736bb9dbc2641cd7311efde015738436b485f496c65723f618a77e163875628c956f6beac692bb025a63412695a5051d924133add72702838 WHIRLPOOL 03fe03b613f77b2a3b83a50e258f403adbf1cc194f3efbbe096cf0a3b50bd5de5ccf936d8264a6441c11472fe2d0b7624df3491be95bfc293c40a65d895cbed9
+MISC ChangeLog 16985 SHA256 f2c04c34090496649cc9edacd2d514fa85b82a576f69bd7a75685a94034bd56e SHA512 7ebd8f757f89b97bc0ce30f44d0e5da49efc7ddd8c6fa0b46676f230043159683056f859b862cdad6a1054f62df43201bb9920b5ae311d75f2206c2ee3695039 WHIRLPOOL f7745bd56423d48b992da9b488ba21b220cc1cfcfce5a1f5870301006288e769aa29da979ff7a455d320cf049a159271dea37aac35df61b0c87abdf431c74f95
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTg7okAAoJEJOE+m71LUu6YbgP/A9mo+P4MO8/jZY6WWMEbXus
-AStdoeqd7sI/u+sceEtTfKwnrjkIETCfkoL4dECxi0uFva+hbDmclo8GXoLjSEPc
-RYcVZ6gSatZ0kUktlWegP0sZ5ua32XnXVuFWfMfGmFrzfwTYqpVZctk36cgmgiL1
-GkxHS2pnuvIP1AC8v1lReMDeB1tFWPwnIriBiOrkCb4CA8KReuWkcAh27yeAKpFk
-end/e4h8TCl/rJAusuYD1HPAKihEZ+4v+sDYtt8QVV3HPWYw/f/VWUgqJrU5/c9b
-NFp19+b1L+oYE2lgJDrQrtu5xUo19U5xsgwjW/RDgUdX6ju4CoY0NfSWjzCk9u7R
-miAejkPXFLSXuLOixG3mVl/SnOnFqQxNH4qGBXtU2iDwdZvZP7N7wELkLHTG9LBK
-zYUztJx22zmkq+G1WS8Pwc/AG6vyPJZjpJ6WFAoAJfC/FwYBybfN08MVfvEu+d+1
-O/LnRLdwoMpHtHLzFGfjKPPcoVTezUIfkpmLMTj1TyVflZTGV5zhsduLCUhthhfn
-zEb2V5s/PNnO274XEc7CKnoYS5YBB4FbDoeXbMSlcvUa8mh3mMkY0Vt7xJ8owjez
-9FOT13XiaBbEEeexnsFzN+Z1mtT65Xq1L/XzF79K87ZqD/nhNmFq9jk1eX7UkT7i
-EHeE+U6ev1q9CpHWp+15
-=DpW/
+iQIcBAEBCAAGBQJTi3I1AAoJEJOE+m71LUu6DzMP/3d4FAzmC0fGlLifOJY/XbHA
+huxYJyftncZPeUU2TL9nQnHvr1NxwrvUIhtaMR8Enmu8bYqg8hAznxRngI0dwFi5
+V5ML1tPm9svN2qwljudWInX1tw+rWOJXSwd+9ZfIuzqra0if+mPcKsKgr+VQf6fW
+5dPksN01lixEeiwTzZlVtROpbIhArl0+49mpit7ZFm/rsLDBzVGdUVGzDuHCazHE
+eUqseYt2ti4mZuz2/p61kUvsXlcCvfn16r/8+A/bIGPh2p8msDrsoIo3eQaWosvS
+n6i9G6A+H+W/h/SIOowdbynFs6Ua+hKrPqyiz77eTxr2T857o65tycZfgMalyFod
+x0FpHdgAOvLzNVG1q8D/Gpp6SDNQ3in0fslahZGGXZTQpZK8ePHddyMx3OSUziwa
+ytz9OSSBOS/it+1ce97ABNnstV1u3V0/8Zpwe8YvtZ06BNnZ1+MNrNrPiX3MmBrq
+A2fizSrny6FH3bdGJ/8iASqpUt5Jd1fCtYXN+6Jn7dQF1ADDg6vm3l5Y3K8eEy5n
+WxDjEZVBUT9SCFZCEfIU6VY/rIXvSxw2zQw3DmOviI3PA9Ks7Clbpm/kpuMzNfU9
+L4AvuGegEHo9136z9+/gEpX0frreUbxwQniCu/f9sWUXAs9vnfLttK2uGmPTcCJs
+DqT0+LRedzZsr08hqYTj
+=BxLY
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.7.ebuild b/sys-fs/eudev/eudev-1.7.ebuild
new file mode 100644
index 000000000000..12e7d400db7b
--- /dev/null
+++ b/sys-fs/eudev/eudev-1.7.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.7.ebuild,v 1.1 2014/06/01 18:29:22 blueness Exp $
+
+EAPI="5"
+
+KV_min=2.6.39
+
+inherit autotools eutils multilib linux-info multilib-minimal
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
+	inherit git-2
+else
+	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	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(-)]
+	)"
+DEPEND="${COMMON_DEPEND}
+	keymap? ( dev-util/gperf )
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-${KV_min}
+	doc? ( >=dev-util/gtk-doc-1.18 )
+	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
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	!sys-fs/udev
+	!sys-apps/systemd"
+
+PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
+	keymap? ( >=sys-apps/hwids-20140304[udev] )
+	openrc? ( >=sys-fs/udev-init-scripts-26 )"
+
+REQUIRED_USE="keymap? ( hwdb )"
+
+# 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() { :; }
+
+pkg_pretend() {
+	if ! use rule-generator; then
+		ewarn
+		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+		ewarn "as described in the URL below:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+		ewarn
+		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+		ewarn "exists:"
+		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
+		ewarn
+		ewarn "We are working on a better solution for the next beta release."
+		ewarn
+	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
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	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
+		elibtoolize
+	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=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--docdir=/usr/share/doc/${PF}
+		--libdir=/usr/$(get_libdir)
+		--with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
+		--with-html-dir="/usr/share/doc/${PF}/html"
+		--enable-split-usr
+		--exec-prefix=/
+
+		$(use_enable gudev)
+	)
+
+	# Only build libudev for non-native_abi, and only install it to libdir,
+	# that means all options only apply to native_abi
+	if multilib_is_native_abi; then
+		econf_args+=(
+			--with-rootlibdir=/$(get_libdir)
+			$(use_enable doc gtk-doc)
+			$(use_enable introspection)
+			$(use_enable keymap)
+			$(use_enable kmod libkmod)
+			$(usex kmod --enable-modules $(use_enable modutils modules))
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else econf_args+=(
+		$(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake -C src/libudev
+		use gudev && emake -C src/gudev
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+		use gudev && emake -C src/gudev DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_test() {
+	# make sandbox get out of the way
+	# these are safe because there is a fake root filesystem put in place,
+	# but sandbox seems to evaluate the paths of the test i/o instead of the
+	# paths of the actual i/o that results.
+	# also only test for native abi
+	if multilib_is_native_abi; then
+		addread /sys
+		addwrite /dev
+		addwrite /run
+		default_src_test
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
+
+	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
+
+	# drop distributed hwdb files, they override sys-apps/hwids
+	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+}
+
+pkg_preinst() {
+	local htmldir
+	for htmldir in gudev libudev; do
+		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
+			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
+		fi
+		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
+			dosym ../../doc/${PF}/html/${htmldir} \
+				/usr/share/gtk-doc/html/${htmldir}
+		fi
+	done
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
+
+	ewarn
+	ewarn "You need to restart eudev as soon as possible to make the"
+	ewarn "upgrade go into effect:"
+	ewarn "\t/etc/init.d/udev --nodeps restart"
+
+	if use rule-generator && use openrc && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+	elog
+}
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index a4bfc3ab1dd7..535c34542cc6 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-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/eudev/eudev-9999.ebuild,v 1.51 2014/05/08 11:47:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.52 2014/06/01 18:29:22 blueness Exp $
 
 EAPI="5"
 
@@ -37,11 +37,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	)"
 DEPEND="${COMMON_DEPEND}
 	keymap? ( dev-util/gperf )
-	>=dev-util/intltool-0.40.0
 	virtual/os-headers
 	virtual/pkgconfig
-	!<sys-devel/make-3.82-r4
-	!<sys-kernel/linux-headers-${KV_min}
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-${KV_min}
 	doc? ( >=dev-util/gtk-doc-1.18 )
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
@@ -54,12 +53,11 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-fs/lvm2-2.02.103
 	!<sec-policy/selinux-base-2.20120725-r10
 	!sys-fs/udev
-	!sys-apps/systemd
-	!<sys-fs/udev-init-scripts-26"
+	!sys-apps/systemd"
 
 PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
 	keymap? ( >=sys-apps/hwids-20140304[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-18 )"
+	openrc? ( >=sys-fs/udev-init-scripts-26 )"
 
 REQUIRED_USE="keymap? ( hwdb )"