Do not print modprobe-errors. Do some locking to not get multiple concurrent modprobe calls for same module, and no multiple loading messages.

Package-Manager: portage-2.1.2.7

5 files changed, 412 insertions, 8 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index ed99df8e23c3..e3207371384a 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.307 2007/05/16 10:31:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.308 2007/05/22 21:41:18 zzam Exp $
+
+*udev-111-r1 (22 May 2007)
+
+  22 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/modprobe-111-r1.sh, +udev-111-r1.ebuild:
+  Do not print modprobe-errors. Do some locking to not get multiple concurrent
+  modprobe calls for same module, and no multiple loading messages.
 
   16 May 2007; Matthias Schwarzott <zzam@gentoo.org> udev-111.ebuild:
   Use /get_libdir/udev, instead of /lib/udev.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 417b832da7d8..fa00b2e0876c 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -29,6 +29,10 @@ AUX modprobe-105.sh 983 RMD160 946919b0a6c3788207f5e4f4fa7e2c15bf1b66b5 SHA1 de5
 MD5 0aba148adab1a0f102f2cda3489d15e3 files/modprobe-105.sh 983
 RMD160 946919b0a6c3788207f5e4f4fa7e2c15bf1b66b5 files/modprobe-105.sh 983
 SHA256 8a238646dd769481a0c69973b21c5833abdba8cbd98f19c9dee5e45f197b7604 files/modprobe-105.sh 983
+AUX modprobe-111-r1.sh 1474 RMD160 9d2680c1921925a02af8e6972df33e08f8a29dc2 SHA1 70fc5d4b6c8a5a8837a55aa0811afca19786b784 SHA256 cad8bef24f0cdf0da3381477f94c30e672f5f3791ec847546fbd91685d2de946
+MD5 544a873721f948faf423388704c6864d files/modprobe-111-r1.sh 1474
+RMD160 9d2680c1921925a02af8e6972df33e08f8a29dc2 files/modprobe-111-r1.sh 1474
+SHA256 cad8bef24f0cdf0da3381477f94c30e672f5f3791ec847546fbd91685d2de946 files/modprobe-111-r1.sh 1474
 AUX net-104-r10.sh 719 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d SHA1 baa060c99d7c38c26bcc629ee9844319bd886647 SHA256 e3d7b8a447087b7357b6b7713089bf84aecf598714a569be75c45d7c3a7581ee
 MD5 6e80c0636d03874473a1f17a4af2b6e7 files/net-104-r10.sh 719
 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d files/net-104-r10.sh 719
@@ -99,14 +103,18 @@ EBUILD udev-104-r12.ebuild 9539 RMD160 3ea7426633221cc11168e6f67872318e55b6295e
 MD5 aa5803220fb1e030e862367e978100bd udev-104-r12.ebuild 9539
 RMD160 3ea7426633221cc11168e6f67872318e55b6295e udev-104-r12.ebuild 9539
 SHA256 0cf0d7a65976ebaaa287ac3eb39b32ff91f553de5af91ad01dc5a170c97bfbe5 udev-104-r12.ebuild 9539
+EBUILD udev-111-r1.ebuild 10289 RMD160 977633c568082766d6b44c616ce622da68f90166 SHA1 3e79de06640a3a6838c85014cd696e87808b7400 SHA256 498b5721ec3206f3c9c41fc0db5abbb9836341c81139489c3429e0bf2aa832d5
+MD5 75f7f771d5e710ceaa69a1b501496ac6 udev-111-r1.ebuild 10289
+RMD160 977633c568082766d6b44c616ce622da68f90166 udev-111-r1.ebuild 10289
+SHA256 498b5721ec3206f3c9c41fc0db5abbb9836341c81139489c3429e0bf2aa832d5 udev-111-r1.ebuild 10289
 EBUILD udev-111.ebuild 10283 RMD160 d43cbdbd20902f110485e4299a8767a223f3c7fb SHA1 83100c8bc471cf1cf6d4bc439f9ad069ef279c8c SHA256 bee390b8c0e10bbc659aca22ef4b073712a6491b8a377797b4639965fb410650
 MD5 1304b26ff1a45be54fb571bbac6f3706 udev-111.ebuild 10283
 RMD160 d43cbdbd20902f110485e4299a8767a223f3c7fb udev-111.ebuild 10283
 SHA256 bee390b8c0e10bbc659aca22ef4b073712a6491b8a377797b4639965fb410650 udev-111.ebuild 10283
-MISC ChangeLog 61140 RMD160 91d58deabd989fde9d95b44f721aecf66e96b655 SHA1 69468e33cda76db819259c556881bd12582614e0 SHA256 cfa622fea0273197454b344d2ea3c83b09f1f34c78a6768fd324a211ce086fd4
-MD5 d095402553f8e79331ac809ec2d9fa73 ChangeLog 61140
-RMD160 91d58deabd989fde9d95b44f721aecf66e96b655 ChangeLog 61140
-SHA256 cfa622fea0273197454b344d2ea3c83b09f1f34c78a6768fd324a211ce086fd4 ChangeLog 61140
+MISC ChangeLog 61419 RMD160 aca76cc5b4825a7b919df627af3fb576ee6b8792 SHA1 bfaa9f4387364f5a8cc5686de3277994cde8d00f SHA256 973dba0571cc45f1f216013630b3ab530de4488b06629d2fc367233a80a2c7ac
+MD5 bf40e7d3e26707c0be6db699e8626c6d ChangeLog 61419
+RMD160 aca76cc5b4825a7b919df627af3fb576ee6b8792 ChangeLog 61419
+SHA256 973dba0571cc45f1f216013630b3ab530de4488b06629d2fc367233a80a2c7ac ChangeLog 61419
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -117,10 +125,13 @@ SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/di
 MD5 f972e05a59a06d7a8f0558e95c815023 files/digest-udev-111 229
 RMD160 e3d3502313bf0cc5c20e675bc2ed2dfc7a26487f files/digest-udev-111 229
 SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/digest-udev-111 229
+MD5 f972e05a59a06d7a8f0558e95c815023 files/digest-udev-111-r1 229
+RMD160 e3d3502313bf0cc5c20e675bc2ed2dfc7a26487f files/digest-udev-111-r1 229
+SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/digest-udev-111-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGSt2Mt2vP6XvVdOcRAje5AJ9897KbGlMsEn+moFvgLnb+KOZxLQCdFvo4
-YrZZTKk+ZgIy2H36kdDHauA=
-=G6Ji
+iD8DBQFGU2OFt2vP6XvVdOcRAoRtAKDdDiAmaZSxlrDmVVmIi+B6wvR6KACdGVMM
+NZk1/sM4UBT3ux3NS4Vq4qY=
+=quDc
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-111-r1 b/sys-fs/udev/files/digest-udev-111-r1
new file mode 100644
index 000000000000..6cefddeda901
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-111-r1
@@ -0,0 +1,3 @@
+MD5 bd2a94e3ed243e6a3d501a5c8afc4b54 udev-111.tar.bz2 190020
+RMD160 bb3f1c2b1e24092b42507b663eceffe17f8a4a06 udev-111.tar.bz2 190020
+SHA256 ec47cc46b15838321c31589d7bdbdcf553c0ea4f406edc6f239cb20a3732c233 udev-111.tar.bz2 190020
diff --git a/sys-fs/udev/files/modprobe-111-r1.sh b/sys-fs/udev/files/modprobe-111-r1.sh
new file mode 100755
index 000000000000..7516096e8457
--- /dev/null
+++ b/sys-fs/udev/files/modprobe-111-r1.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Do not continue for non-modular kernel - Bug #168322
+[ ! -f /proc/modules ] && exit 0
+
+if [ -e /dev/.udev_populate ]; then
+	# Enable verbose while called from udev-addon-start
+	. /dev/.udev_populate
+
+	if [ -c "${CONSOLE}" ]; then
+		# redirect stdin/out/err
+		exec <${CONSOLE} >${CONSOLE} 2>/${CONSOLE}
+	fi
+fi
+
+. /etc/init.d/functions.sh
+
+MODPROBE=/sbin/modprobe
+
+# Create a lock file for the current module.
+lock_modprobe() {
+	[ -e /dev/.udev/ ] || return 0
+
+	MODPROBE_LOCK="/dev/.udev/.lock-modprobe-${MODNAME}"
+
+	retry=20
+	while ! mkdir "$MODPROBE_LOCK" 2> /dev/null; do
+		if [ $retry -eq 0 ]; then
+			 ewarn "Could lock modprobe ${MODNAME}!"
+			 return 1
+		fi
+		sleep 1
+		retry=$(($retry - 1))
+	done
+	return 0
+}
+
+unlock_modprobe() {
+	[ "$MODPROBE_LOCK" ] || return 0
+	rmdir "$MODPROBE_LOCK" || true
+}
+
+MODLIST=$("${MODPROBE}" -q -i --show-depends "${@}" 2>/dev/null \
+	| sed -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" -e 's|-|_|g')
+
+# exit if you have no modules to load
+[ -z "${MODLIST}" ] && exit 0
+for m in ${MODLIST}; do
+	MODNAME=$m
+done
+
+# check for blacklisting
+if [ -f /etc/modprobe.conf ]; then
+	if grep -q '^blacklist.*[[:space:]]'"${MODNAME}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then
+		# module blacklisted
+		exit 0
+	fi
+fi
+
+lock_modprobe
+# check if loaded
+if ! grep -q "^${MODNAME}[[:space:]]" /proc/modules; then
+	# now do real loading
+	einfo "  udev loading module ${MODNAME}"
+	"${MODPROBE}" -q "${@}" >/dev/null 2>/dev/null
+fi
+unlock_modprobe
+
diff --git a/sys-fs/udev/udev-111-r1.ebuild b/sys-fs/udev/udev-111-r1.ebuild
new file mode 100644
index 000000000000..1c3a8f193209
--- /dev/null
+++ b/sys-fs/udev/udev-111-r1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-111-r1.ebuild,v 1.1 2007/05/22 21:41:18 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-apps/coldplug"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.12.5"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+pkg_setup() {
+	udev_helper_dir="/$(get_libdir)/udev"
+}
+
+sed_helper_dir() {
+	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
+	EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PN}-110-root-link-1.diff
+
+	# No need to clutter the logs ...
+	sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
+	# Do not use optimization flags from the package
+	sed -ie 's|$(OPTIMIZATION)||g' Makefile
+
+	# Make sure there is no sudden changes to udev.rules.gentoo
+	# (more for my own needs than anything else ...)
+	MD5=`md5sum < "${S}/etc/udev/gentoo/50-udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "04a8f3303a2b172affbed26973745f26" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+
+	sed_helper_dir \
+		etc/udev/gentoo/50-udev.rules \
+		extras/rule_generator/write_*_rules \
+		udev_rules_parse.c \
+		udev_utils_run.c
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	local myconf=
+	local extras="extras/ata_id \
+				  extras/cdrom_id \
+				  extras/edd_id \
+				  extras/firmware \
+				  extras/floppy \
+				  extras/path_id \
+				  extras/scsi_id \
+				  extras/usb_id \
+				  extras/volume_id \
+				  extras/rule_generator \
+				  extras/root_link"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	echo "get_libdir = $(get_libdir)"
+	emake \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS_COMPILE=${mycross} \
+		OPTFLAGS="" \
+		${myconf} || die
+}
+
+src_install() {
+	# we install everything by "hand" and don't rely on the udev Makefile to do
+	# it for us (why? it's easier that way...)
+	dobin udevinfo		|| die "Required binary not installed properly"
+	dobin udevtest		|| die "Required binary not installed properly"
+	dobin udevmonitor	|| die "Required binary not installed properly"
+	into /
+	dosbin udevd		|| die "Required binary not installed properly"
+	dosbin udevstart	|| die "Required binary not installed properly"
+	dosbin udevtrigger	|| die "Required binary not installed properly"
+	dosbin udevcontrol	|| die "Required binary not installed properly"
+	dosbin udevsettle	|| die "Required binary not installed properly"
+
+	# Helpers
+	exeinto "${udev_helper_dir}"
+	doexe extras/ata_id/ata_id		|| die "Required helper not installed properly"
+	doexe extras/volume_id/vol_id	|| die "Required helper not installed properly"
+	doexe extras/scsi_id/scsi_id	|| die "Required helper not installed properly"
+	doexe extras/usb_id/usb_id		|| die "Required helper not installed properly"
+	doexe extras/path_id/path_id	|| die "Required helper not installed properly"
+	doexe extras/cdrom_id/cdrom_id	|| die "Required helper not installed properly"
+	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_cd_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_net_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/rule_generator.functions	|| die "Required helper not installed properly"
+	doexe extras/root_link/get_dir_major_minor || die "Required helper not installed properly"
+	doexe extras/floppy/create_floppy_devices	|| die "Required binary not installed properly"
+	doexe extras/firmware/firmware.sh			|| die "Required binary not installed properly"
+	newexe ${FILESDIR}/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
+	newexe ${FILESDIR}/modprobe-111-r1.sh modprobe.sh	|| die "Required binary not installed properly"
+
+	keepdir "${udev_helper_dir}"/state
+	keepdir "${udev_helper_dir}"/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id
+	dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id
+
+	# vol_id library (needed by mount and HAL)
+	dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
+	# move the .a files to /usr/lib
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a  "${D}"/usr/$(get_libdir)/
+
+	# handle static linking bug #4411
+	gen_usr_ldscript libvolume_id.so
+
+	# save pkgconfig info
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins extras/volume_id/lib/*.pc
+
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_108 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	doins etc/udev/gentoo/??-*.rules
+	#newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules
+	#newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules
+	#doins ${FILESDIR}/95-udev-late.rules
+	# Special rules for device-mapper
+	#newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.rules
+	# Use upstream's persistent rules for devices
+	doins etc/udev/rules.d/60-*.rules
+	doins extras/rule_generator/75-*.rules || die "rules not installed properly"
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# all of the man pages
+	doman *.7
+	doman *.8
+	doman extras/ata_id/ata_id.8
+	doman extras/edd_id/edd_id.8
+	doman extras/scsi_id/scsi_id.8
+	doman extras/volume_id/vol_id.8
+	doman extras/cdrom_id/cdrom_id.8
+	# create a extra symlink for udevcontrol
+	dosym udevd.8 /usr/share/man/man8/udevcontrol.8
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-110-r1.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-110-r1.sh udev-stop.sh
+
+	# convert /lib/udev to real used dir
+	sed_helper_dir "${D}/$(get_libdir)"/rcscripts/addons/*.sh
+
+	# needed to compile latest Hal
+	insinto /usr/include
+	doins extras/volume_id/lib/libvolume_id.h
+
+	dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs}
+	dodoc docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
+
+	insinto /etc/modprobe.d
+	newins ${FILESDIR}/blacklist-110 blacklist
+	doins ${FILESDIR}/pnp-aliases
+
+	# convert /lib/udev to real used dir
+	sed_helper_dir "${D}"/etc/modprobe.d/*
+
+	if use s390; then
+		# s390 does not has persistent mac addresses
+		# and we only have persistence rules for mac.
+		# For now just remove the rules file.
+		rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules
+	fi
+
+}
+
+pkg_preinst() {
+	if [[ -d ${ROOT}/lib/udev-state ]] ; then
+		mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
+		rm -r "${ROOT}"/lib/udev-state
+	fi
+
+	if [ -f "${ROOT}/etc/udev/udev.config" -a \
+	     ! -f "${ROOT}/etc/udev/udev.rules" ]
+	then
+		mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules
+	fi
+
+	# delete the old udev.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug
+	fi
+
+	# is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind)
+	coldplug_stale=""
+	if [ -f "${ROOT}/etc/init.d/coldplug" ]
+	then
+		coldplug_stale="1"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == "/" ]] ; then
+		# check if root of init-process is identical to ours
+		if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
+			einfo "restarting udevd now."
+			if [[ -n $(pidof udevd) ]] ; then
+				killall -15 udevd &>/dev/null
+				sleep 1
+				killall -9 udevd &>/dev/null
+			fi
+			/sbin/udevd --daemon
+		fi
+	fi
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	if [[ ${coldplug_stale} == "1" ]] ; then
+		ewarn "A stale coldplug init script found. You should run:"
+		ewarn
+		ewarn "      rc-update del coldplug"
+		ewarn "      rm -f /etc/init.d/coldplug"
+		ewarn
+		ewarn "udev now provides its own coldplug functionality."
+	fi
+
+	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
+	if has_version "=sys-fs/udev-103-r3"; then
+		if [[ -e "${ROOT}/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 ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules
+		fi
+	fi
+
+	# Removing some device-nodes we thought we need some time ago
+	if [[ -d "${ROOT}"/lib/udev/devices ]]; then
+		rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Removing some old file
+	if has_version "<sys-fs/udev-104-r5"; then
+		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
+	fi
+
+	if has_version "<sys-fs/udev-106-r5"; then
+		if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then
+			rm -f ${ROOT}/etc/udev/rules.d/95-net.rules
+		fi
+	fi
+
+	# Try to remove /etc/dev.d as that is obsolete
+	if [[ -d "${ROOT}"/etc/dev.d ]]; then
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d
+		if [[ -d "${ROOT}"/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
+
+	einfo
+	einfo "For more information on udev on Gentoo, writing udev rules, and"
+	einfo "         fixing known issues visit:"
+	einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}