Another part of the fix for #438932.

Now we require both udev-mount and udev to be added to the sysinit
runlevel.

Package-Manager: portage-2.2.0_alpha140/cvs/Linux i686
RepoMan-Options: --force
Manifest-Sign-Key: 0x30C46538

3 files changed, 606 insertions, 5 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 99742a67cfda..fe623f318a0d 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.729 2012/10/20 00:17:31 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.730 2012/10/20 05:43:32 williamh Exp $
+
+*udev-171-r8 (20 Oct 2012)
+
+  20 Oct 2012; William Hubbs <williamh@gentoo.org> +udev-171-r8.ebuild:
+  Another part of the fix for #438932.
+  Now we require both udev-mount and udev to be added to the sysinit
+  runlevel.
 
 *udev-171-r7 (20 Oct 2012)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 6c649736fafe..f5bdd8feab46 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -37,6 +37,7 @@ EBUILD udev-151-r4.ebuild 16792 SHA256 b9821f05b54788b589b142c61149ce0e8529e58ad
 EBUILD udev-164-r2.ebuild 15166 SHA256 5b95ac84b12592a869cd25e4d20cec86befd68d9cf8ceec6e215e5ff3fb6c268 SHA512 1abe951175d7071e4c2736e50c43ded1fa2bc733e7b15e50ee2ab0acc0a35c4072b40bcd0971f4a42b5bb92e282df50eb5918ba37ffbcb72f4fdf9161fd800cc WHIRLPOOL 910a74ff36e7635830a6958651f629b9e69dbc7677f6a332cd6d0d5ce7278fa3040fdf70461eb5ff50740aa5cd58d49687001564ca810373bb211ebf6e4fa2b2
 EBUILD udev-171-r6.ebuild 15730 SHA256 546ac267598aef8f2270b181020483a80c0e4b06822f7d96e7f32c2a1bfe2eec SHA512 55bb65cf1ec7d14dddcd604591a0bb2112777f37d7d6e29dfc527c3f4c4f00e3e47ebb7c02e014a351ffc54c55bc5cccb78bdb9caff27936932e639e6277ca9c WHIRLPOOL c6a141614965a6f446429994320d9b4fafae877614cded1a3f71187c2f05b5b5721714e2c4b304303851cf0050b3c3ab60e45cffb8f2520ff8765effb24398a2
 EBUILD udev-171-r7.ebuild 15752 SHA256 761402d907996ce17e00f87aaf64b13d92f2c1c233bf57e746744e0450f6f7cb SHA512 8d53ad36c0f4e472dbdcf92226019407645a6981257cd4558e19ca86f15689e5fc4dc5f2724661d2562459ebfa99e1da79f4d4f60ff892ce0cfbcdc304e7860e WHIRLPOOL 59e8d8b7a683aca802ba0e8143cc262afc88ae7d456884ee1726c3ce6508ebe0fed2214659e34ed2aeef52ce0a0c8a207d6da33e672101c68eaf012935a7f844
+EBUILD udev-171-r8.ebuild 16255 SHA256 60d36d29d6a67f1b147f76abf1af791db3bd057693970647d2810deca37b3a57 SHA512 93dbbab663dd1fc80241a2a590dd241b21e3a2710727b1b4adc031dfe7e561f5c81785db5ade2a8df95cb4af09814dcbf46762100824f61ac529f36ee895d5c7 WHIRLPOOL 4622a125a78391d40bf5f67c6101e95ca6c6bcb79407359425d41b8bab75f9e998429e9c8bee52f96f04f373ec2ce990682bc37c388aca6c7d5205a3b3dac4fe
 EBUILD udev-189.ebuild 11032 SHA256 49a18eeb31611fc22416bc81319d10e40d7554c7fae24f8cdf8cdf751334e12a SHA512 c066003c803468358a58be1e370f69396614d9ecc78f2275e86e3e47f6906eca16232fe8e5800d44d9c0295b314e37602da37a140639ed1b01df664a7a77b826 WHIRLPOOL 0867dae834d126f69bb206025a2b8adae7d7f1dc43c410361353ca47a709e87b4ff6e8ef4f9893cdf229cedf9bf79ded3e12cce484f429d2b9bfa991d2d180a9
 EBUILD udev-190.ebuild 11032 SHA256 ff0a13f6fb5cefd0d4b8c19ec8419a65859179d3d7408757b2332ef38655077c SHA512 02bd90a2e0be05a87fe213e3ef8144aab5de3ba70e436078d20d0c81bfd6c18a1e8a76bf5a807a77b62d3e49284a575f04963bc3de71b38c6486b24f5b0fd1ef WHIRLPOOL 55293d6e6fd220703b7619a73d871e499378860d9259c8dc6983cf8cb7e2740d462d507c9c2cac92493c3c3690d752288f7303abea8c727ed0e62a24e1cf2bdb
 EBUILD udev-191.ebuild 11032 SHA256 f7a1e68b1d5d4b21e075e4f0475160e36abf478a91ee8ca2eb78412683919deb SHA512 02b7de416d535aa8fadd453482add6e4343e2113ea4a984e42acdc688b35e4fa76f85fa3c835d824003048a8df81e0280528605853c529182c94710f2cd3238b WHIRLPOOL 4f354a56827dda78ea90f5cebb433ffe12eb19b19783c723c961cf8f2ca3312f93d79638705ea75c46de7a32d9afc241dba4c6576cd8005d95edfc4078e6dcbe
@@ -44,13 +45,13 @@ EBUILD udev-192.ebuild 11032 SHA256 420ffcca68b32ca0ff066509e66937ad3d2f5336e8f2
 EBUILD udev-193.ebuild 11033 SHA256 6e3d701b54d1a7b685cc637aea3420770affe94b9d355e0fb7eb5db95d9b4ab2 SHA512 de0c107ad032dd077118b95ce9b2f82e5d85696e9446f5999fd923e43382fcc3b53797d27a2c99d2bb276265c95624d5f9e3055416fb8a08ad2b09b03dc063b8 WHIRLPOOL 9d0c6455ff66b1b5408fd53590326e23c242d7198840de2b6b6563c20b39f85993cb942ecf67501743e5d78031d489108250693e6d903fd99ab3b63f6b8a4c5d
 EBUILD udev-194.ebuild 11082 SHA256 8df89a558f8a06ca00b85002c34b5eae34bb30f06adef0c9cb02fd6a8b1e7521 SHA512 8b90291ba59e47e2bf26f59a2d7ead9c782c61c4f17b669cccb192297bf1070e72b948a8f444cb1dbfd5098ace6e52533f90d08af3a3bad0eff6f29676e981ae WHIRLPOOL 17501224f0594776619f891fbe3f84afb329fcda970bf57ae64adb96bdbfddccfa1eacf6eceebbcfae60372e2692a8511997ba72abad6134f60a4d2818156e82
 EBUILD udev-9999.ebuild 11084 SHA256 49c2850e6f81a3124f970af0b33047261dc83936f4afd9625149b62a0728ca1e SHA512 eb184f5aaabd75e6f387b52fb6f5bf4c571e1513fed5737eceb61a859c4a9d84a9510e82bdb970449051a8f67303ea117fb82311f0df9b2f8b3259e2cf4dc023 WHIRLPOOL 13ac40b7b28f792fc00ba6cc30742e0b192af3403ae946706f5343ae9d02501e93fc3bf797c2060ec7b69e28845c0d0bb80988d6f0c4b81f0526c99f1cacfedf
-MISC ChangeLog 41996 SHA256 244d5e0df8edf72c830fed65a573039375d5bcb6353288a989a189fef318e148 SHA512 a584eea001ea61c7e15d5b0e02d454e2ec18d8bd06ee7d48f41d0dba4747781f7f4311849ab8dcdc570ed5508416acba8671057531f63a3585e00b4d5d1201aa WHIRLPOOL 70a54826f180f349bb63360c65e05ffedd3f32436fcb5c79054e2582e8546313bdafe1dce5bcbc1ffaee79aa2c998ac82a99d30d98c8a0ec776e98917d773895
+MISC ChangeLog 42217 SHA256 0e4aec3fb3bad8a5aafb82b36fe3a6ce8164c2564fd5b13abba7e7d3a6010ad7 SHA512 ea9aaae046f999920fc51d997c8a8c4e39c2f7af95263725674aad8a7271fd9fb457d23f856741a2d74aa20e1e8b474de1581f6514bcdcba44b471f8ec9e7b6f WHIRLPOOL 0a987ff7e246dda5218ed7b5b80dbabc9c925408ac5e71fa1c285ac8d9fea206986da141cf3a5b867b998d0e0f92179a672e2678b6816c7b830cc86b9dd64314
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCB7aYACgkQblQW9DDEZThdOwCghm7UF0m/FMFimHcxAI2mi7Vi
-UVkAn0+RFudQ4azvgvjkXYSjwNrreslS
-=ZUR0
+iEYEAREIAAYFAlCCOg0ACgkQblQW9DDEZTjKRACeKyXFsyI7GOyCuMq4D1G5sLC3
+8QQAniCwS/AARJGP5wUYmx1bsEEm8h+8
+=DCLX
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-171-r8.ebuild b/sys-fs/udev/udev-171-r8.ebuild
new file mode 100644
index 000000000000..ffb7d7ac5921
--- /dev/null
+++ b/sys-fs/udev/udev-171-r8.ebuild
@@ -0,0 +1,593 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r8.ebuild,v 1.1 2012/10/20 05:43:32 williamh Exp $
+
+EAPI=4
+
+KV_min=2.6.32
+KV_reliable=2.6.32
+PATCHSET=${P}-gentoo-patchset-v1
+scriptversion=7.1
+scriptname=udev-gentoo-scripts
+[[ -n "${scriptversion}" ]] && scriptname="${scriptname}-${scriptversion}"
+
+if [[ ${PV} == "9999" ]]
+then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+	EGIT_BRANCH="master"
+	inherit autotools git-2
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
+
+if [[ ${PV} != "9999" ]]
+then
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+	# please update testsys-tarball whenever udev-xxx/test/sys/ is changed
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+			 test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )
+			 http://dev.gentoo.org/~ssuominen/${PN}-gentoo-legacy-patchset-1.tar.bz2"
+	if [[ -n "${PATCHSET}" ]]
+	then
+		SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+	fi
+fi
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~williamh/dist/${scriptname}.tar.bz2"
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev/udev.html http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build selinux test debug +rule_generator hwdb gudev introspection
+	keymap floppy edd action_modeswitch extras"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+	extras? ( dev-libs/glib:2
+		dev-libs/gobject-introspection
+		virtual/libusb:0 )
+	gudev? ( dev-libs/glib:2 )
+	introspection? ( dev-libs/gobject-introspection )
+	action_modeswitch? ( virtual/libusb:0 )
+	>=sys-apps/util-linux-2.16
+	!<sys-libs/glibc-2.11"
+
+DEPEND="${COMMON_DEPEND}
+	keymap? ( dev-util/gperf )
+	extras? ( dev-util/gperf )
+	virtual/pkgconfig
+	virtual/os-headers
+	!<sys-kernel/linux-headers-2.6.34
+	test? ( app-text/tree )"
+
+RDEPEND="${COMMON_DEPEND}
+	hwdb?
+	(
+		>=sys-apps/usbutils-0.82
+		|| (
+			( sys-apps/hwids >=sys-apps/pciutils-3.1.9-r2 )
+			>=sys-apps/pciutils-3.1.9-r1[-compress-db]
+			<sys-apps/pciutils-3.1.9-r1[-zlib]
+			)
+	)
+	extras?
+	(
+		>=sys-apps/usbutils-0.82
+		sys-apps/pciutils
+	)
+	!sys-apps/coldplug
+	!<sys-fs/lvm2-2.02.45
+	!sys-fs/device-mapper
+	>=sys-apps/baselayout-2"
+
+if [[ ${PV} == "9999" ]]
+then
+	# for documentation processing with xsltproc
+	DEPEND="${DEPEND}
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd
+		dev-util/gtk-doc"
+fi
+
+# required kernel options
+CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+	~!IDE ~BLK_DEV_BSG"
+
+# Return values:
+# 2 - reliable
+# 1 - unreliable
+# 0 - too old
+udev_check_KV() {
+	local ok=0
+	if kernel_is -ge ${KV_reliable//./ }
+	then
+		ok=2
+	elif kernel_is -ge ${KV_min//./ }
+	then
+		ok=1
+	fi
+	return $ok
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	# always print kernel version requirements
+	ewarn
+	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+	if [[ ${KV_min} != ${KV_reliable} ]]
+	then
+		ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
+	fi
+
+	udev_check_KV
+	case "$?" in
+		2)	einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;;
+		1)	ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
+			ewarn "but it may be unreliable in some cases."
+			;;
+		0)	eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+			;;
+	esac
+
+	KV_FULL_SRC=${KV_FULL}
+	get_running_version
+	udev_check_KV
+	if [[ "$?" = "0" ]]
+	then
+		eerror
+		eerror "udev cannot be restarted after emerging,"
+		eerror "as your running kernel version (${KV_FULL}) is too old."
+		eerror "You really need to use a newer kernel after a reboot!"
+		NO_RESTART=1
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if [[ ${PV} == "9999" ]]
+	then
+		git-2_src_unpack
+	fi
+}
+
+src_prepare() {
+	if use test && [[ -d "${WORKDIR}"/test/sys ]]
+	then
+		mv "${WORKDIR}"/test/sys "${S}"/test/
+	fi
+
+	# patches go here...
+
+	# backport some patches
+	if [[ -n "${PATCHSET}" ]]
+	then
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+			  EPATCH_FORCE="yes" epatch
+	fi
+
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+		-i rules/{rules.d,arch}/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	if [[ ${PV} != 9999 ]]
+	then
+		# Make sure there is no sudden changes to upstream rules file
+		# (more for my own needs than anything else ...)
+		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
+		MD5=${MD5/  -/}
+		if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]]
+		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
+	fi
+
+	if [[ ${PV} == 9999 ]]
+	then
+		gtkdocize --copy || die "gtkdocize failed"
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+use_extras() { use extras && echo "--enable-${2:-$1}" || use_enable "$@" ; }
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--sysconfdir="${EPREFIX}/etc" \
+		--sbindir="${EPREFIX}/sbin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/lib/udev" \
+		--enable-logging \
+		--enable-static \
+		$(use_with selinux) \
+		$(use_enable debug) \
+		$(use_extras rule_generator) \
+		$(use_extras hwdb) \
+		--with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \
+		--with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \
+		--disable-udev_acl \
+		$(use_extras gudev) \
+		$(use_extras introspection) \
+		$(use_extras keymap) \
+		$(use_extras floppy) \
+		$(use_extras edd) \
+		$(use_extras action_modeswitch) \
+		$(systemd_with_unitdir)
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	emake
+}
+
+src_install() {
+	into /
+	emake DESTDIR="${D}" install
+
+	exeinto /lib/udev
+	keepdir /lib/udev/state
+	keepdir /lib/udev/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "../lib/udev/scsi_id" /sbin/scsi_id
+
+	# Add gentoo stuff to udev.conf
+	echo "# If you need to change mount-options, do it in /etc/fstab" \
+	>> "${ED}"/etc/udev/udev.conf
+
+	# let the dir exist at least
+	keepdir /etc/udev/rules.d
+
+	# Now installing rules
+	cd "${S}"/rules
+	insinto /lib/udev/rules.d/
+
+	# support older kernels
+	doins misc/30-kernel-compat.rules
+
+	# Adding arch specific rules
+	if [[ -f arch/40-${ARCH}.rules ]]
+	then
+		doins "arch/40-${ARCH}.rules"
+	fi
+	cd "${S}"
+
+	insinto /etc/modprobe.d
+	newins "${WORKDIR}"/blacklist-146 blacklist.conf
+	newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf
+
+	# documentation
+	dodoc ChangeLog README TODO
+
+	# keep doc in just one directory, Bug #281137
+	rm -rf "${ED}/usr/share/doc/${PN}"
+	if use keymap
+	then
+		dodoc extras/keymap/README.keymap.txt
+	fi
+
+	cd "${WORKDIR}/${scriptname}"
+	sed -i -e 's/2.6.34/2.6.32/' init.d/udev
+	doconfd conf.d/*
+	exeinto /lib/udev
+	doexe helpers/*
+	doexe "${WORKDIR}"/shell-compat-KV.sh
+	doinitd init.d/*
+	insinto /etc/modprobe.d
+	doins modprobe.d/*
+	insinto /lib/udev/rules.d
+	doins rules.d/*
+}
+
+src_test() {
+	local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
+
+	cd "${S}"
+	vecho ">>> Test phase [udev:check]: ${CATEGORY}/${PF}"
+	has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests"
+	if ! $emake_cmd -j1 check
+	then
+		has test $FEATURES && die "udev: Make test failed. See above for details."
+		has test $FEATURES || eerror "udev: Make test failed. See above for details."
+	fi
+}
+
+pkg_preinst() {
+	# moving old files to support newer modprobe, 12 May 2009
+	local f dir=${EROOT}/etc/modprobe.d/
+	for f in pnp-aliases blacklist; do
+		if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
+		then
+			elog "Moving $dir/$f to $f.conf"
+			mv -f "$dir/$f" "$dir/$f.conf"
+		fi
+	done
+
+	if [[ -d ${EROOT}/lib/udev-state ]]
+	then
+		mv -f "${EROOT}"/lib/udev-state/* "${ED}"/lib/udev/state/
+		rm -r "${EROOT}"/lib/udev-state
+	fi
+
+	if [[ -f ${EROOT}/etc/udev/udev.config &&
+		 ! -f ${EROOT}/etc/udev/udev.rules ]]
+	then
+		mv -f "${EROOT}"/etc/udev/udev.config "${EROOT}"/etc/udev/udev.rules
+	fi
+
+	# delete the old udev.hotplug symlink if it is present
+	if [[ -h ${EROOT}/etc/hotplug.d/default/udev.hotplug ]]
+	then
+		rm -f "${EROOT}"/etc/hotplug.d/default/udev.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [[ -h ${EROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]]
+	then
+		rm -f "${EROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [[ -h ${EROOT}/etc/hotplug.d/default/10-udev.hotplug ]]
+	then
+		rm -f "${EROOT}"/etc/hotplug.d/default/10-udev.hotplug
+	fi
+
+	has_version "=${CATEGORY}/${PN}-103-r3"
+	previous_equal_to_103_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-104-r5"
+	previous_less_than_104_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-106-r5"
+	previous_less_than_106_r5=$?
+
+	has_version "<${CATEGORY}/${PN}-113"
+	previous_less_than_113=$?
+}
+
+# 19 Nov 2008
+fix_old_persistent_net_rules() {
+	local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules
+	[[ -f ${rules} ]] || return
+
+	elog
+	elog "Updating persistent-net rules file"
+
+	# Change ATTRS to ATTR matches, Bug #246927
+	sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
+
+	# Add KERNEL matches if missing, Bug #246849
+	sed -ri \
+		-e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
+		"${rules}"
+}
+
+# See Bug #129204 for a discussion about restarting udevd
+restart_udevd() {
+	if [[ ${NO_RESTART} = "1" ]]
+	then
+		ewarn "Not restarting udevd, as your kernel is too old!"
+		return
+	fi
+
+	# need to merge to our system
+	[[ ${EROOT} = / ]] || return
+
+	# check if root of init-process is identical to ours (not in chroot)
+	[[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
+
+	# abort if there is no udevd running
+	[[ -n $(pidof udevd) ]] || return
+
+	# abort if no /dev/.udev exists
+	[[ -e /dev/.udev ]] || return
+
+	elog
+	elog "restarting udevd now."
+
+	killall -15 udevd &>/dev/null
+	sleep 1
+	killall -9 udevd &>/dev/null
+
+	/sbin/udevd --daemon
+	sleep 3
+	if [[ ! -n $(pidof udevd) ]]
+	then
+		eerror "FATAL: udev died, please check your kernel is"
+		eerror "new enough and configured correctly for ${P}."
+		eerror
+		eerror "Please have a look at this before rebooting."
+		eerror "If in doubt, please downgrade udev back to your old version"
+	fi
+}
+
+postinst_init_scripts() {
+	local enable_postmount=false
+
+	# FIXME: inconsistent handling of init-scripts here
+	#  * udev is added to sysinit in openrc-ebuild
+	#  * we add udev-postmount to default in here
+	#
+
+	# If we are building stages, add udev and udev-mount to the sysinit runlevel
+	# automatically.
+	if use build
+	then
+		if [[ -x "${EROOT}"/etc/init.d/udev  \
+			&& -d "${EROOT}"/etc/runlevels/sysinit ]]
+		then
+			ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev
+		fi
+		if [[ -x "${ROOT}"/etc/init.d/udev-mount \
+			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
+		then
+			ln -s /etc/init.d/udev-mount \
+				"${ROOT}"/etc/runlevels/sysinit/udev-mount
+		fi
+		enable_postmount=true
+	fi
+
+	# Warn the user about adding the scripts to their sysinit runlevel
+	if [[ -e "${EROOT}"/etc/runlevels/sysinit ]]
+	then
+		if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]]
+		then
+			ewarn
+			ewarn "You need to add udev to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev sysinit"
+		fi
+		if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]]
+		then
+			ewarn
+			ewarn "You need to add udev-mount to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev-mount sysinit"
+		fi
+	fi
+
+	# add udev-postmount to default runlevel instead of that ugly injecting
+	# like a hotplug event, 2009/10/15
+
+	# already enabled?
+	[[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return
+
+	[[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
+	[[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
+
+	if $enable_postmount
+	then
+		local initd=udev-postmount
+
+		if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \
+			[[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]]
+		then
+			ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd}
+			elog "Auto-adding '${initd}' service to your default runlevel"
+		fi
+	else
+		elog "You should add the udev-postmount service to default runlevel."
+		elog "Run this to add it:"
+		elog "\trc-update add udev-postmount default"
+	fi
+}
+
+pkg_postinst() {
+	fix_old_persistent_net_rules
+
+	# "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
+
+	restart_udevd
+
+	postinst_init_scripts
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	# delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007
+	if [[ $previous_equal_to_103_r3 = 0 ]] &&
+		[[ -e ${EROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
+	then
+		ewarn "Deleting stray 40-scsi-hotplug.rules"
+		ewarn "installed by sys-fs/udev-103-r3"
+		rm -f "${EROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules
+	fi
+
+	# Removing some device-nodes we thought we need some time ago, 25 Jan 2007
+	if [[ -d ${EROOT}/lib/udev/devices ]]
+	then
+		rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Removing some old file, 29 Jan 2007
+	if [[ $previous_less_than_104_r5 = 0 ]]
+	then
+		rm -f "${EROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/net 2>/dev/null
+	fi
+
+	# 19 Mar 2007
+	if [[ $previous_less_than_106_r5 = 0 ]] &&
+		[[ -e ${EROOT}/etc/udev/rules.d/95-net.rules ]]
+	then
+		rm -f "${EROOT}"/etc/udev/rules.d/95-net.rules
+	fi
+
+	# Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
+	if [[ -d ${EROOT}/etc/dev.d ]]
+	then
+		rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null
+		if [[ -d ${EROOT}/etc/dev.d ]]
+		then
+			ewarn "You still have the directory /etc/dev.d on your system."
+			ewarn "This is no longer used by udev and can be removed."
+		fi
+	fi
+
+	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
+	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
+	if [[ $previous_less_than_113 = 0 ]] &&
+		[[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+		! has_version sys-fs/device-mapper
+	then
+			rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules
+			einfo "Removed unneeded file 64-device-mapper.rules"
+	fi
+
+	# requested in Bug #225033:
+	elog
+	elog "persistent-net does assigning fixed names to network devices."
+	elog "If you have problems with the persistent-net rules,"
+	elog "just delete the rules file"
+	elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules"
+	elog "and then reboot."
+	elog
+	elog "This may however number your devices in a different way than they are now."
+
+	ewarn
+	ewarn "If you build an initramfs including udev, then please"
+	ewarn "make sure that the /sbin/udevadm binary gets included,"
+	ewarn "and your scripts changed to use it,as it replaces the"
+	ewarn "old helper apps udevinfo, udevtrigger, ..."
+
+	ewarn
+	ewarn "mount options for directory /dev are no longer"
+	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
+	ewarn "as for other directories."
+
+	ewarn
+	ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
+	ewarn "then please migrate over to using the device names"
+	ewarn "/dev/md*, /dev/loop* and /dev/ram*."
+	ewarn "The devfs-compat rules have been removed."
+	ewarn "For reference see Bug #269359."
+
+	ewarn
+	ewarn "Rules for /dev/hd* devices have been removed"
+	ewarn "Please migrate to libata."
+
+	elog
+	elog "For more information on udev on Gentoo, writing udev rules, and"
+	elog "         fixing known issues visit:"
+	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}