Update version. Enable firmware loading, bug #138126. Add patches from bug #119989.

Package-Manager: portage-2.1.1_pre2-r8

7 files changed, 858 insertions, 5 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index d34fd6d07371..921854911bdf 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.205 2006/07/06 02:57:33 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.206 2006/07/15 17:16:52 azarah Exp $
+
+*udev-096 (15 Jul 2006)
+
+  15 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +files/udev.rules-096,
+  +files/udev-096-udevtrigger.patch, +files/udev-start-096.sh,
+  +udev-096.ebuild:
+  Update version. Enable firmware loading, bug #138126. Add patches from bug
+  #119989.
 
   06 Jul 2006; Joshua Kinard <kumba@gentoo.org> udev-090-r1.ebuild:
   Marked stable on mips.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3fc1ac61e8e8..b910f0daade3 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 SHA1 fbdeedb8b7a638c9d930f1e405aa83e55d9d2eec SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b
 MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288
 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288
@@ -18,6 +21,10 @@ AUX udev-050-udev_volume_id.patch 388 RMD160 e2e8131bbe9b0cea78cfcc247f0324d6704
 MD5 7b0a35c905183730e4dfdcf29f5a1816 files/udev-050-udev_volume_id.patch 388
 RMD160 e2e8131bbe9b0cea78cfcc247f0324d6704abc3d files/udev-050-udev_volume_id.patch 388
 SHA256 6cacaea9b3c58e30b4427021ca10592d27d2179065b7120f94f6a1fc6e125280 files/udev-050-udev_volume_id.patch 388
+AUX udev-096-udevtrigger.patch 1338 RMD160 15bdcb2f2491ac1b43c7b53a6f96e1c1f9fb1f9f SHA1 221399b1e643a6749860147e2d4dc8df9bcf6d2e SHA256 ddc764e76465f06eac1a113416c604e0b273001afe664807e32b9343f63fbd8f
+MD5 898d3e9e29c7045fc9512cd42fde89c0 files/udev-096-udevtrigger.patch 1338
+RMD160 15bdcb2f2491ac1b43c7b53a6f96e1c1f9fb1f9f files/udev-096-udevtrigger.patch 1338
+SHA256 ddc764e76465f06eac1a113416c604e0b273001afe664807e32b9343f63fbd8f files/udev-096-udevtrigger.patch 1338
 AUX udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 SHA1 574d12600292d5cd1acb3b1be2bc24d337581a88 SHA256 a1b40d1bf3f8a7e0d6787d310218b44916c79a4f94a39287bc00f8ae058b67ff
 MD5 2f18f7560f7667fa98179c6084396453 files/udev-parisc-path_id-again.patch 524
 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 files/udev-parisc-path_id-again.patch 524
@@ -50,6 +57,10 @@ AUX udev-start-090.sh 3731 RMD160 12400ab85b10fc6d945b6f676f32f080f60d66e4 SHA1
 MD5 22a69269f0000ae84871958c295487c4 files/udev-start-090.sh 3731
 RMD160 12400ab85b10fc6d945b6f676f32f080f60d66e4 files/udev-start-090.sh 3731
 SHA256 af2b3a0903c23e59f2319506ea5d8cd4b1c0eaa9785060c376ad99a926bfadcd files/udev-start-090.sh 3731
+AUX udev-start-096.sh 3572 RMD160 c3373af1decfaab68d7015a6772fc4c60259f60e SHA1 bfbbe39b9c410c28d98a8ca68daa7fc7c2bcd97e SHA256 f0bc75120bdcdcb0eaeaf11e135cacbc8aef9ba9d61413f9a2170570c3a2d5c0
+MD5 705b1119eb6ca2d8299a0595215ea47f files/udev-start-096.sh 3572
+RMD160 c3373af1decfaab68d7015a6772fc4c60259f60e files/udev-start-096.sh 3572
+SHA256 f0bc75120bdcdcb0eaeaf11e135cacbc8aef9ba9d61413f9a2170570c3a2d5c0 files/udev-start-096.sh 3572
 AUX udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c SHA1 2558e3265c9bed383198e2f263e10016ad6f34a0 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d
 MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460
 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460
@@ -130,6 +141,10 @@ AUX udev.rules-094 12567 RMD160 e905949bcae612ef26be117880125a4c7ad3ae31 SHA1 63
 MD5 ca8429e7d9fc41bdd2dcb4f101b0be9a files/udev.rules-094 12567
 RMD160 e905949bcae612ef26be117880125a4c7ad3ae31 files/udev.rules-094 12567
 SHA256 c96973459dcfa093ab2be66f5b002dd562af444150f8b8bda3ffc724191f4971 files/udev.rules-094 12567
+AUX udev.rules-096 12542 RMD160 6fc16208be9213949042bb71c3c47115217e66b0 SHA1 f28e089bd2e9f07c24c83bc2eb67f30d4e31fb0c SHA256 dfe087c2da595aa60df8dd686a99e3227ddfc0422132d7021c81fbd8c3bab526
+MD5 88f07e970daa82d23f7a51a30a99ec54 files/udev.rules-096 12542
+RMD160 6fc16208be9213949042bb71c3c47115217e66b0 files/udev.rules-096 12542
+SHA256 dfe087c2da595aa60df8dd686a99e3227ddfc0422132d7021c81fbd8c3bab526 files/udev.rules-096 12542
 AUX udev.rules.post_012 4184 RMD160 0fa81b4bafa732497b8e65cf658adf2cf32f3a0a SHA1 12300249d33f01c4fd1a8708a4733dafddb90ffe SHA256 3fc8785c40acb43d92a2f7b3c4e21cfa7b947fb5d2e87d1c109297ff34994100
 MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
 RMD160 0fa81b4bafa732497b8e65cf658adf2cf32f3a0a files/udev.rules.post_012 4184
@@ -151,6 +166,7 @@ DIST udev-087.tar.bz2 190053 RMD160 3eefbc4bb4df3ffe3678cd1a8c57d247d6e59dcd SHA
 DIST udev-089.tar.bz2 191032 RMD160 3e845904ce1c24b407c616f0cb024d758a7afbe2 SHA1 2c2dbf047b475d95deab251887a32c8dad2a0935 SHA256 cee32e4392d0c3ea84838e98ead8ca2a031c332126e0ff5321b981135b7e76fd
 DIST udev-090.tar.bz2 192213 RMD160 77c1cd3cd71d781daf420824723cc520c75f41c8 SHA1 c5072cb2eaa4cd35b12685bd786c6c56ffbfedd7 SHA256 fd938b4144093261ed0437a6a7ce167526113ead596059ebae779b3fe219b4b3
 DIST udev-094.tar.bz2 194721 RMD160 204330e28707e1fa5b699a89e1f663ecfd264e04 SHA1 665132873ece8f3c01d3786c91e7932a73645ca7 SHA256 a920b3c8126363f9559988e6b68148939ae09d1cccb9573c69a261b23a393590
+DIST udev-096.tar.bz2 194109 RMD160 93aa8ef19160434d96800a7890af120e3b66a833 SHA1 8d15b89fdf93ba84e2d33ff6061e140aed0a4dce SHA256 a6e08ce1a29adf2fff0ee198a632f13d867929afd10a726829bc75b52afa453b
 EBUILD udev-068-r1.ebuild 6698 RMD160 16b86a0149c8cd49d75211049521c8520145503a SHA1 7d15be5b8b91acf55aa180990218c1b23280d253 SHA256 8813968cc7f3966b301307298d805cf47109ee2abfdc7d202b2f982399f59af4
 MD5 0b0240991924922eab433e39cf1ca953 udev-068-r1.ebuild 6698
 RMD160 16b86a0149c8cd49d75211049521c8520145503a udev-068-r1.ebuild 6698
@@ -267,10 +283,14 @@ EBUILD udev-094.ebuild 9801 RMD160 5ab88ac3e905955bbe07a1906de72c6c8e32821f SHA1
 MD5 d35ce48bccd8ace599349522e66de23d udev-094.ebuild 9801
 RMD160 5ab88ac3e905955bbe07a1906de72c6c8e32821f udev-094.ebuild 9801
 SHA256 3e3a0697372448ad89edc405b754d3afec97429b274a481a58e45aa025fabb87 udev-094.ebuild 9801
-MISC ChangeLog 37026 RMD160 daf416df811f2ade98cc098eb8dd84e5b451bf40 SHA1 19c05ba5886256af9faa7dc3e8e21d5f0bcd0ef0 SHA256 b5e3a322b53c2cbf21e7a0246bbcc9aee095abbd389e16901e57a3c957d8421e
-MD5 96860de4410d1c94c31c50a6c43c1b69 ChangeLog 37026
-RMD160 daf416df811f2ade98cc098eb8dd84e5b451bf40 ChangeLog 37026
-SHA256 b5e3a322b53c2cbf21e7a0246bbcc9aee095abbd389e16901e57a3c957d8421e ChangeLog 37026
+EBUILD udev-096.ebuild 10307 RMD160 7dc41653172abfdaa5586d132abc0a94fb847111 SHA1 11302b105fed6a5dea33b1b4a15d18c2cfdcc4c8 SHA256 e9d18a4e46f7cc6c2b42cf177456091a8c0d8c9956b84286fa9ec7a83120ae66
+MD5 a8874c0b3e034a179db407819bea9cc6 udev-096.ebuild 10307
+RMD160 7dc41653172abfdaa5586d132abc0a94fb847111 udev-096.ebuild 10307
+SHA256 e9d18a4e46f7cc6c2b42cf177456091a8c0d8c9956b84286fa9ec7a83120ae66 udev-096.ebuild 10307
+MISC ChangeLog 37299 RMD160 100f2068752370b48d9866774a55d379d11f482e SHA1 6cf80ab84f7be8f74811a968a5b6f2f6fde764da SHA256 9ca26803eb78510e7d297dd0548e66f60c99560907baa24c7d12d47d6e80da23
+MD5 07fd36cfd9bbdfabc2aa304be254de9e ChangeLog 37299
+RMD160 100f2068752370b48d9866774a55d379d11f482e ChangeLog 37299
+SHA256 9ca26803eb78510e7d297dd0548e66f60c99560907baa24c7d12d47d6e80da23 ChangeLog 37299
 MISC metadata.xml 260 RMD160 f1b0916156eade656b558b7507109b69ed78d394 SHA1 3e34c50d52c32d6524b8de2d553e62a40798c043 SHA256 31722725c8bf774ad90600f7a3f50f2ca76c1396aad6888ce1cc08ce981b1552
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 RMD160 f1b0916156eade656b558b7507109b69ed78d394 metadata.xml 260
@@ -362,3 +382,13 @@ SHA256 50879961dd1c70fe88683704a50b768edeccbbc018962031a0f4f54f10b6cc6f files/di
 MD5 b5f2c45b72b3e978d0d38e3d1915478f files/digest-udev-094 229
 RMD160 1231b7fa7f5781db4e4427efa4adfeacecdfbe69 files/digest-udev-094 229
 SHA256 2ffa93cdaecf04989e52504888b7927e3c77dc375949d846aff55d786ef37986 files/digest-udev-094 229
+MD5 9c42ff06c73efc631ff1a3cb6a67e6b9 files/digest-udev-096 229
+RMD160 7fba4e2d8c5c9e879f7e0bde6f8f4c0808e2dade files/digest-udev-096 229
+SHA256 fdb17aa32ce5f0da94e52fabc03d2ae82db45cbfae2edb4cdc0c51023a5beee6 files/digest-udev-096 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEuSOF1ZcsMnZjRyIRAtt4AKC/yfupxXRPNaUEnjeIeA55GBC0/ACeJ/Nr
+mrsB5LFnBcIjc6SsF0QIv+c=
+=t52W
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-096 b/sys-fs/udev/files/digest-udev-096
new file mode 100644
index 000000000000..7068d6b78f90
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-096
@@ -0,0 +1,3 @@
+MD5 f4effef7807ce1dc91ab581686ef197b udev-096.tar.bz2 194109
+RMD160 93aa8ef19160434d96800a7890af120e3b66a833 udev-096.tar.bz2 194109
+SHA256 a6e08ce1a29adf2fff0ee198a632f13d867929afd10a726829bc75b52afa453b udev-096.tar.bz2 194109
diff --git a/sys-fs/udev/files/udev-096-udevtrigger.patch b/sys-fs/udev/files/udev-096-udevtrigger.patch
new file mode 100644
index 000000000000..b3b0c714ed52
--- /dev/null
+++ b/sys-fs/udev/files/udev-096-udevtrigger.patch
@@ -0,0 +1,46 @@
+--- udev-094.orig/udevtrigger.c	2006-06-12 09:27:03.000000000 +0100
++++ udev-094/udevtrigger.c	2006-07-05 10:57:54.662529856 +0100
+@@ -321,6 +321,9 @@
+ int main(int argc, char *argv[], char *envp[])
+ {
+ 	int i;
++	int scan_block = 1;
++	int scan_bus = 1;
++	int scan_class = 1;
+ 
+ 	logging_init("udevtrigger");
+ 	udev_config_init();
+@@ -331,21 +334,28 @@
+ 	for (i = 1 ; i < argc; i++) {
+ 		char *arg = argv[i];
+ 
+-		if (strcmp(arg, "--verbose") == 0 || strcmp(arg, "-v") == 0)
++		if (strcmp(arg, "--no-scan-block") == 0)
++			scan_block = 0;
++		else if (strcmp(arg, "--no-scan-bus") == 0)
++			scan_bus = 0;
++		else if (strcmp(arg, "--no-scan-class") == 0)
++			scan_class = 0;
++		else if (strcmp(arg, "--verbose") == 0 || strcmp(arg, "-v") == 0)
+ 			verbose = 1;
+ 		else if (strcmp(arg, "--dry-run") == 0 || strcmp(arg, "-n") == 0)
+ 			dry_run = 1;
+ 		else {
+-			fprintf(stderr, "Usage: udevtrigger [--verbose] [--dry-run]\n");
++			fprintf(stderr, "Usage: udevtrigger [--no-scan-block] [--no-scan-bus] [--no-scan-class]\n");
++			fprintf(stderr, "                   [--verbose] [--dry-run]\n");
+ 			goto exit;
+ 		}
+ 	}
+ 
+ 	sysfs_init();
+ 
+-	udev_scan_bus();
+-	udev_scan_class();
+-	udev_scan_block();
++	if (scan_bus) udev_scan_bus();
++	if (scan_class) udev_scan_class();
++	if (scan_block) udev_scan_block();
+ 	exec_lists();
+ 
+ 	sysfs_cleanup();
diff --git a/sys-fs/udev/files/udev-start-096.sh b/sys-fs/udev/files/udev-start-096.sh
new file mode 100644
index 000000000000..e9bac6030d2e
--- /dev/null
+++ b/sys-fs/udev/files/udev-start-096.sh
@@ -0,0 +1,139 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+udev_version() {
+	local version=0
+
+	if [[ -x /sbin/udev ]] ; then
+		version=$(/sbin/udev -V)
+		# We need it without a leading '0', else bash do the wrong thing
+		version=${version##0}
+		# Older udev's will print nothing
+		[[ -z ${version} ]] && version=0
+	fi
+
+	echo "${version}"
+}
+
+populate_udev() {
+	# populate /dev with devices already found by the kernel
+	if [ $(get_KV) -gt "$(KV_to_int '2.6.14')" ] ; then
+		ebegin "Populating /dev with existing devices through uevents"
+		local opts=
+		[[ ${RC_COLDPLUG} != "yes" && $(udev_version) -ge "96" ]] && \
+			opts="--no-scan-bus"
+		/sbin/udevtrigger ${opts}
+		eend $?
+	else
+		ebegin "Populating /dev with existing devices with udevstart"
+		/sbin/udevstart
+		eend $?
+	fi
+
+	# loop until everything is finished
+	# there's gotta be a better way...
+	ebegin "Letting udev process events"
+	/sbin/udevsettle --timeout=60
+	eend $?
+
+	return 0
+}
+
+seed_dev() {
+	# Seed /dev with some things that we know we need
+	ebegin "Seeding /dev with needed nodes"
+
+	# copy over any persistant things
+	if [[ -d /lib/udev/devices ]] ; then
+		cp --preserve=all --recursive --update /lib/udev/devices/* /dev
+	fi
+
+	# Not provided by sysfs but needed
+	ln -snf /proc/self/fd /dev/fd
+	ln -snf fd/0 /dev/stdin
+	ln -snf fd/1 /dev/stdout
+	ln -snf fd/2 /dev/stderr
+	[[ -e /proc/kcore ]] && ln -snf /proc/kcore /dev/core
+
+	# Create problematic directories
+	mkdir -p /dev/{pts,shm}
+	eend 0
+}
+
+main() {
+	# Setup temporary storage for /dev
+	ebegin "Mounting /dev for udev"
+	if [[ ${RC_USE_FSTAB} == "yes" ]] ; then
+		mntcmd=$(get_mount_fstab /dev)
+	else
+		unset mntcmd
+	fi
+	if [[ -n ${mntcmd} ]] ; then
+		try mount -n ${mntcmd}
+	else
+		# This is bash only, but saves on using grep
+		if [[ $(</proc/filesystems)$'\n' =~ '[[:space:]]tmpfs'$'\n' ]] ; then
+			mntcmd="tmpfs"
+		else
+			mntcmd="ramfs"
+		fi
+		# many video drivers require exec access in /dev #92921
+		try mount -n -t ${mntcmd} udev /dev -o exec,nosuid,mode=0755
+	fi
+	eend $?
+
+	# Create a file so that our rc system knows it's still in sysinit.
+	# Existance means init scripts will not directly run.
+	# rc will remove the file when done with sysinit.
+	touch /dev/.rcsysinit
+
+	# Selinux lovin; /selinux should be mounted by selinux-patched init
+	if [[ -x /sbin/restorecon && -c /selinux/null ]] ; then
+		restorecon /dev &> /selinux/null
+	fi
+
+	# Actually get udev rolling
+	if [[ ${RC_DEVICE_TARBALL} == "yes" && \
+	      -s /lib/udev-state/devices.tar.bz2 ]] ; then
+		ebegin "Populating /dev with saved device nodes"
+		try tar -jxpf /lib/udev-state/devices.tar.bz2 -C /dev
+		eend $?
+	fi
+
+	seed_dev
+
+	# Setup hotplugging (if possible)
+	if [[ -e /proc/sys/kernel/hotplug ]] ; then
+		ebegin "Setting up proper hotplug agent"
+		eindent
+		if [[ $(get_KV) -gt $(KV_to_int '2.6.14') ]] ; then
+			einfo "Using netlink for hotplug events..."
+			echo "" > /proc/sys/kernel/hotplug
+		else
+			einfo "Setting /sbin/udevsend as hotplug agent ..."
+			echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
+		fi
+		eoutdent
+		eend 0
+	fi
+
+	ebegin "Starting udevd"
+	/sbin/udevd --daemon
+	eend $?
+
+	populate_udev
+
+	# Create nodes that udev can't
+	ebegin "Finalizing udev configuration"
+	[[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null
+	[[ -x /sbin/lvm ]] && \
+		/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
+	# Running evms_activate on a LiveCD causes lots of headaches
+	[[ -z ${CDBOOT} ]] && [[ -x /sbin/evms_activate ]] && \
+		/sbin/evms_activate -q &>/dev/null
+	eend 0
+}
+
+main
+
+# vim:ts=4
diff --git a/sys-fs/udev/files/udev.rules-096 b/sys-fs/udev/files/udev.rules-096
new file mode 100644
index 000000000000..02ff38b9a9fe
--- /dev/null
+++ b/sys-fs/udev/files/udev.rules-096
@@ -0,0 +1,334 @@
+# /etc/udev/rules/50-udev.rules:  device naming rules for udev
+#
+# Gentoo specific rules
+#
+# There are a number of modifiers that are allowed to be used in some of the
+# fields.  See the udev man page for a full description of them.
+#
+# Try not to modify this file, if you wish to change things, create a new rule
+# file that can be run before this one.
+#
+
+
+# console
+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",	OPTIONS="last_rule"
+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",	OPTIONS="last_rule"
+KERNEL=="vcs*",                 NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="vcsa*",                NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="tty",                  NAME="%k", GROUP="tty", MODE="0666",	OPTIONS="last_rule"
+KERNEL=="tty[0-9]",             NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="tty[0-9][0-9]",        NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="console",		NAME="%k", GROUP="tty", MODE="0600"
+KERNEL=="ptmx",			NAME="%k", GROUP="tty", MODE="0666"
+
+# tty devices
+KERNEL=="ttyS[0-9]*",	NAME="%k", SYMLINK="tts/%n", GROUP="tty"
+KERNEL=="ttyUSB[0-9]*",	NAME="%k", SYMLINK="tts/USB%n", GROUP="tty", MODE="0660"
+KERNEL=="ippp0",	NAME="%k", GROUP="tty"
+KERNEL=="isdn*"		NAME="%k", GROUP="tty"
+KERNEL=="dcbri*",	NAME="%k", GROUP="tty"
+KERNEL=="ircomm*",	NAME="%k", GROUP="tty"
+
+# all block devices
+SUBSYSTEM=="block", GROUP="disk"
+
+# cdrom symlinks and other good cdrom naming
+BUS=="ide",	KERNEL=="hd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL=="scd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL=="sg[0-9]*", ACTION=="add", DRIVER=="sr", GROUP="cdrom"
+ENV{ID_CDROM}=="?*",		PROGRAM="/lib/udev/seq_node.sh %r %k cdrom", SYMLINK+="%c", GROUP="cdrom"
+ENV{ID_CDROM_CD_RW}=="?*",	PROGRAM="/lib/udev/seq_node.sh %r %k cdrw",  SYMLINK+="%c"
+ENV{ID_CDROM_DVD}=="?*",	PROGRAM="/lib/udev/seq_node.sh %r %k dvd",   SYMLINK+="%c"
+ENV{ID_CDROM_DVD_R}=="?*",	PROGRAM="/lib/udev/seq_node.sh %r %k dvdrw", SYMLINK+="%c"
+
+# disk devices
+KERNEL=="sd*",		NAME="%k", GROUP="disk"
+KERNEL=="dasd*",	NAME="%k", GROUP="disk"
+KERNEL=="ataraid*",	NAME="%k", GROUP="disk"
+
+# compaq smart array
+KERNEL=="cciss*",	NAME="%k"
+KERNEL=="ida*",		NAME="%k"
+
+# mylex
+KERNEL=="rd*",		NAME="%k"
+
+# dri devices
+KERNEL=="card*",	NAME="dri/card%n", GROUP="video"
+KERNEL=="nvidia*",	NAME="%k", GROUP="video"
+KERNEL=="3dfx*",	NAME="%k", GROUP="video"
+
+# alsa devices
+SUBSYSTEM=="sound", GROUP="audio"
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hw[CD0-9]*",		NAME="snd/%k"
+KERNEL=="pcm[CD0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# capi devices
+KERNEL=="capi",		NAME="capi20", SYMLINK+="isdn/capi20", GROUP="dialout"
+KERNEL=="capi*",	NAME="capi/%n", GROUP="dialout"
+
+# cpu devices
+KERNEL=="cpu[0-9]*",	NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",	NAME="cpu/%n/msr"
+KERNEL=="microcode",	NAME="cpu/microcode"
+
+# dm devices (ignore them)
+KERNEL=="dm-[0-9]*",	OPTIONS="ignore_device"
+# create a symlink named after the device map name
+# note devmap_name comes with extras/multipath
+#KERNEL=="dm-[0-9]*",	PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+# fb devices
+KERNEL=="fb[0-9]*",	NAME="fb/%n", SYMLINK+="%k", GROUP="video"
+
+# floppy devices
+KERNEL=="fd[0-9]*",	NAME="floppy/%n", SYMLINK+="%k", GROUP="floppy"
+
+# i2c devices
+KERNEL=="i2c-[0-9]*",	NAME="i2c/%n", SYMLINK+="%k"
+
+# input devices
+KERNEL=="mice",		NAME="input/%k", MODE="0644"
+KERNEL=="mouse*",	NAME="input/%k", MODE="0644"
+KERNEL=="event*",	NAME="input/%k", MODE="0600"
+KERNEL=="js*",		NAME="input/%k", MODE="664"
+KERNEL=="ts*",		NAME="input/%k", MODE="0600"
+
+# loop devices
+KERNEL=="loop[0-9]*",	NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
+
+# md block devices
+KERNEL=="md[0-9]*",	NAME="md/%n", SYMLINK+="%k", GROUP="disk"
+
+# aoe char devices,
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k", GROUP="disk", MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k", GROUP="disk", MODE="0440"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k", GROUP="disk", MODE="0220"
+
+# misc devices
+KERNEL=="agpgart",	NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="psaux",	NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="rtc",		NAME="misc/%k", SYMLINK+="%k", MODE="0664"
+KERNEL=="uinput",	NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="inotify",	NAME="misc/%k", SYMLINK+="%k", MODE="0666"
+
+# netlink devices
+KERNEL=="route",	NAME="netlink/%k"
+KERNEL=="skip",		NAME="netlink/%k"
+KERNEL=="usersock",	NAME="netlink/%k"
+KERNEL=="fwmonitor",	NAME="netlink/%k"
+KERNEL=="tcpdiag",	NAME="netlink/%k"
+KERNEL=="nflog",	NAME="netlink/%k"
+KERNEL=="xfrm",		NAME="netlink/%k"
+KERNEL=="arpd",		NAME="netlink/%k"
+KERNEL=="route6",	NAME="netlink/%k"
+KERNEL=="ip6_fw",	NAME="netlink/%k"
+KERNEL=="dnrtmsg",	NAME="netlink/%k"
+KERNEL=="tap*",		NAME="netlink/%k"
+
+# network devices
+KERNEL=="tun",		NAME="net/%k",	MODE="0600"
+
+# ramdisk devices
+KERNEL=="ram[0-9]*",	NAME="rd/%n", SYMLINK+="%k"
+
+# IEEE1394 (firewire) devices (must be before raw devices below)
+KERNEL=="raw1394",	NAME="%k",		GROUP="video"
+KERNEL=="dv1394*",	NAME="dv1394/%n",	GROUP="video"
+KERNEL=="video1394*",	NAME="video1394/%n",	GROUP="video"
+
+# raw devices
+KERNEL=="raw[0-9]*",	NAME="raw/%k", GROUP="disk"
+KERNEL=="ram*",		NAME="%k", GROUP="disk"
+
+# sound devices
+KERNEL=="adsp",			NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="adsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="audio",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="audio[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="dsp",			NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="dsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="mixer",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="mixer[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="sequencer",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+
+# memory devices
+KERNEL=="random",	NAME="%k", MODE="0666"
+KERNEL=="urandom",	NAME="%k", MODE="0444"
+KERNEL=="mem",		NAME="%k", MODE="0640"
+KERNEL=="kmem",		NAME="%k", MODE="0640"
+KERNEL=="port",		NAME="%k", MODE="0640"
+KERNEL=="full",		NAME="%k", MODE="0666"
+KERNEL=="null",		NAME="%k", MODE="0666"
+KERNEL=="zero",		NAME="%k", MODE="0666"
+
+# usb devices
+KERNEL=="hiddev*",		NAME="usb/%k"
+KERNEL=="auer*",		NAME="usb/%k"
+KERNEL=="legousbtower*",	NAME="usb/%k", GROUP="usb"
+KERNEL=="dabusb*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k", GROUP="lp"
+
+# v4l devices
+KERNEL=="video[0-9]*",	NAME="v4l/video%n", SYMLINK+="video%n", GROUP="video"
+KERNEL=="radio[0-9]*",	NAME="v4l/radio%n", SYMLINK+="radio%n", GROUP="video"
+KERNEL=="vbi[0-9]*",	NAME="v4l/vbi%n", SYMLINK+="vbi%n", GROUP="video"
+KERNEL=="vtx[0-9]*",	NAME="v4l/vtx%n", GROUP="video"
+
+# dvb devices
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
+
+# Asterisk Zaptel devices
+KERNEL=="zapctl",	NAME="zap/ctl"
+KERNEL=="zaptimer",	NAME="zap/timer"
+KERNEL=="zapchannel",	NAME="zap/channel"
+KERNEL=="zappseudo",	NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",	NAME="zap/%n"
+
+# pilot/palm devices
+KERNEL=="pilot",	NAME="%k", GROUP="uucp"
+
+# jaz devices
+KERNEL=="jaz*",		NAME="%k", GROUP="disk"
+
+# zip devices
+KERNEL=="pocketzip*",	NAME="%k", GROUP="disk"
+KERNEL=="zip*",		NAME="%k", GROUP="disk"
+
+# ls120 devices
+KERNEL=="ls120",	NAME="%k", GROUP="disk"
+
+# lp devices
+KERNEL=="lp*",		NAME="%k", GROUP="lp"
+KERNEL=="irlpt",	NAME="%k", GROUP="lp"
+KERNEL=="usblp",	NAME="%k", GROUP="lp"
+KERNEL=="lp*",		NAME="%k", GROUP="lp"
+KERNEL=="parport*",	NAME="%k", GROUP="lp"
+
+# tape devices
+KERNEL=="ht*",		NAME="%k", GROUP="tape"
+KERNEL=="nht*",		NAME="%k", GROUP="tape"
+KERNEL=="pt*",		NAME="%k", GROUP="tape"
+KERNEL=="npt*",		NAME="%k", GROUP="tape"
+KERNEL=="st*",		NAME="%k", GROUP="tape"
+KERNEL=="nst*",		NAME="%k", GROUP="tape"
+KERNEL=="osst*",	NAME="%k", GROUP="tape"
+KERNEL=="nosst*",	NAME="%k", GROUP="tape"
+
+# diskonkey devices
+KERNEL=="diskonkey*",	NAME="%k", GROUP="disk"
+
+# rem_ide devices
+KERNEL=="microdrive*",	NAME="%k", GROUP="disk"
+
+# kbd devices
+KERNEL=="kbd",		NAME="%k", MODE="0664"
+
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi",	NAME="%k", MODE="0666"
+
+# packet devices
+KERNEL=="pktcdvd",		NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
+
+# infiniband devices
+KERNEL=="umad*",	NAME="infiniband/%k"
+KERNEL=="issm*",	NAME="infiniband/%k"
+
+# tpm devices
+KERNEL=="tpm*",	NAME="%k", OWNER="tss", GROUP="tss", MODE="0600"
+
+#######################################
+# Persistant block device stuff - begin
+#######################################
+
+# Skip all of this if we are not adding a block device
+ACTION!="add",		GOTO="persistent_end"
+SUBSYSTEM!="block",	GOTO="persistent_end"
+KERNEL=="ram*|loop*|fd*|nbd*",	GOTO="persistent_end"
+
+# skip accessing removable ide devices, cause the ide drivers are horrible broken
+BUS=="ide", SYSFS{removable}=="1", GOTO="no_volume_id"
+BUS=="ide", SYSFS{../removable}=="1", GOTO="no_volume_id"
+
+# persistent disk device links /dev/disk/
+KERNEL=="hd*[!0-9]", IMPORT="/sbin/ata_id --export $tempnode"
+KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
+KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
+
+KERNEL=="sd*[!0-9]", SYSFS{ieee1394_id}=="*", IMPORT="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394'"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/usb_id -x"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -s %p -d %N"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -a -s %p -d %N"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+KERNEL=="sd*[0-9]", IMPORT{parent}=="ID_*"
+KERNEL=="sd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+
+# Skip id for ram / loop / fd
+KERNEL=="ram*", GOTO="no_volume_id"
+KERNEL=="loop*", GOTO="no_volume_id"
+KERNEL=="fd*", GOTO="no_volume_id"
+
+KERNEL=="*[!0-9]", ENV{ID_TYPE}=="?*", IMPORT="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
+KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
+
+# volume-label/uuid
+KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="no_volume_id"
+KERNEL=="sr*", GOTO="no_volume_id"
+KERNEL=="*[0-9]", IMPORT="/sbin/vol_id --export $tempnode"
+KERNEL=="*[0-9]", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+KERNEL=="*[0-9]", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+LABEL="no_volume_id"
+
+LABEL="persistent_end"
+
+#####################################
+# Persistant block device stuff - end
+#####################################
+
+# usbfs-like device nodes
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
+
+
+# Module autoloading
+
+# Autoload modules that lack aliases but have them defined inutoload modules
+SYSFS{modalias}=="?*", ACTION=="add", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# /etc/modprobe.conf.
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+# If you have problems with some pnp modules being loaded, please enter the
+# following aliases into the modprobe configuration files.  These are needed by
+# udev to autoload some modules
+# alias pnp:dPNP0510 irtty-sir
+# alias pnp:dPNP0511 irtty-sir
+# alias pnp:dPNP0700 floppy
+# alias pnp:dPNP0800 pcspkr
+# alias pnp:dPNP0b00 rtc
+# alias pnp:dPNP0303 atkbd
+# alias pnp:dPNP0f13 psmouse
+# alias pnp:dPNPb02f analog
+
+
+
+# Load firmware
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware.sh"
+
+
+# be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems
+# run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart
+ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd $env{SUBSYSTEM}"
+
+# always run /etc/dev.d/ stuff for now.
+RUN+="/sbin/udev_run_devd $env{SUBSYSTEM}"
+
+# debugging monitor
+RUN+="socket:/org/kernel/udev/monitor"
diff --git a/sys-fs/udev/udev-096.ebuild b/sys-fs/udev/udev-096.ebuild
new file mode 100644
index 000000000000..367463aa7ce8
--- /dev/null
+++ b/sys-fs/udev/udev-096.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-096.ebuild,v 1.1 2006/07/15 17:16:52 azarah Exp $
+
+inherit eutils flag-o-matic
+
+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"
+
+# still rely on hotplug (need to fix that), but now we implement coldplug
+
+DEPEND="sys-apps/hotplug-base"
+RDEPEND="!sys-apps/coldplug"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.11.14"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	#epatch ${FILESDIR}/${P}-udev_volume_id.patch
+	# Add --no-scan-{block,bus,class} options to udevtrigger, bug #119989
+	epatch ${FILESDIR}/${P}-udevtrigger.patch
+
+	# 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/udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "590d3e6346938e3b608237973f4f1805" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	local myconf=
+	local extras="extras/ata_id \
+				  extras/cdrom_id \
+				  extras/dasd_id \
+				  extras/edd_id \
+				  extras/firmware \
+				  extras/floppy \
+				  extras/path_id \
+				  extras/run_directory \
+				  extras/scsi_id \
+				  extras/usb_id \
+				  extras/volume_id"
+
+	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)"
+	# Do not work with emake
+	make \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS_COMPILE=${mycross} \
+		${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 udev			|| die "Required binary not installed properly"
+	dosbin udevd		|| die "Required binary not installed properly"
+	#dosbin udevsend		|| 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
+	dosbin extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
+	dosbin extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
+	dosbin extras/ata_id/ata_id		|| die "Required helper not installed properly"
+	dosbin extras/volume_id/vol_id	|| die "Required helper not installed properly"
+	dosbin extras/scsi_id/scsi_id	|| die "Required helper not installed properly"
+	dosbin extras/usb_id/usb_id		|| die "Required helper not installed properly"
+	dosbin extras/path_id/path_id	|| die "Required helper not installed properly"
+	dosbin extras/cdrom_id/cdrom_id	|| die "Required helper not installed properly"
+	dosbin extras/dasd_id/dasd_id	|| die "Required helper not installed properly"
+	dosbin extras/edd_id/edd_id		|| die "Required helper not installed properly"
+
+	# 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
+
+	#exeinto /etc/udev/scripts
+	exeinto /lib/udev
+	#doexe extras/ide-devfs.sh
+	#doexe extras/scsi-devfs.sh
+	#doexe extras/raid-devfs.sh
+	doexe extras/floppy/create_floppy_devices	|| die "Required binary not installed properly"
+	doexe extras/firmware/firmware.sh			|| die "Required binary not installed properly"
+	doexe ${FILESDIR}/seq_node.sh				|| die "Required binary not installed properly"
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_081 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	newins etc/udev/gentoo/udev.rules 50-udev.rules
+	newins ${FILESDIR}/udev.rules-096 50-udev.rules
+	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules
+	# We cover most of these, but add them for good measure and as examples
+	doins etc/udev/60-*.rules
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# set up symlinks in /etc/hotplug.d/default
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
+
+	# set up the /etc/dev.d directory tree
+	dodir /etc/dev.d/default
+	dodir /etc/dev.d/net
+	exeinto /etc/dev.d/net
+	doexe extras/run_directory/dev.d/net/hotplug.dev
+
+	# 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/dasd_id/dasd_id.8
+	doman extras/cdrom_id/cdrom_id.8
+
+	# our udev hooks into the rc system
+	insinto /lib/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-096.sh udev-start.sh
+	doins "${FILESDIR}"/udev-stop.sh
+
+	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
+
+}
+
+pkg_preinst() {
+	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
+
+	# 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
+
+	# Create some nodes that we know we need.
+	# set the time/date so we can see in /dev which ones we copied over
+	# in the udev-start.sh script
+	mkdir -p ${ROOT}/lib/udev/devices
+
+	if [ ! -e ${ROOT}/lib/udev/devices/null ] ; then
+	    mknod ${ROOT}/lib/udev/devices/null c 1 3
+	fi
+	chmod 666 ${ROOT}/lib/udev/devices/null
+	touch -t 200010220101 ${ROOT}/lib/udev/devices/null
+
+	if [ ! -e ${ROOT}/lib/udev/devices/zero ] ; then
+	    mknod ${ROOT}/lib/udev/devices/zero c 1 5
+	fi
+	chmod 666 ${ROOT}/lib/udev/devices/zero
+	touch -t 200010220101 ${ROOT}/lib/udev/devices/zero
+
+	if [ ! -e ${ROOT}/lib/udev/devices/console ] ; then
+	    mknod ${ROOT}/lib/udev/devices/console c 5 1
+	fi
+	chmod 600 ${ROOT}/lib/udev/devices/console
+	chown root:tty ${ROOT}/lib/udev/devices/console
+	touch -t 200010220101 ${ROOT}/lib/udev/devices/console
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+	/sbin/udevd --daemon
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+	if has_version '<sys-fs/udev-046' ; then
+		ewarn "Note: If you rely on the output of udevinfo for anything, please"
+		ewarn "      either run 'udevstart' now, or reboot, in order to get a"
+		ewarn "      up-to-date udev database."
+		ewarn
+	fi
+	if has_version '<sys-fs/udev-050' ; then
+		ewarn "Note: If you had written some custom permissions rules, please"
+		ewarn "      realize that the permission rules are now part of the main"
+		ewarn "      udev rules files and are not stand-alone anymore.  This means"
+		ewarn "      you need to rewrite them."
+		ewarn
+	fi
+	if has_version '<sys-fs/udev-059' ; then
+		ewarn "Note: If you are upgrading from a version of udev prior to 059"
+		ewarn "      and you have written custom rules, and rely on the etc/dev.d/"
+		ewarn "      functionality, or the etc/hotplug.d functionality, or just"
+		ewarn "      want to write some very cool and power udev rules, please "
+		ewarn "      read the RELEASE-NOTES file for details on what has changed"
+		ewarn "      with this feature, and how to change your rules to work properly."
+		ewarn
+	elif has_version '<sys-fs/udev-057' ; then
+		ewarn "Note: If you have written custom rules, and rely on the etc/dev.d/"
+		ewarn "      functionality, please read the RELEASE-NOTES file for details"
+		ewarn "      on what has changed with this feature, and how to change your"
+		ewarn "      rules to work properly."
+		ewarn
+	fi
+	if has_version '<sys-fs/udev-063' ; then
+		ewarn "Note: If you use the devfs-style names for your block devices"
+		ewarn "      or use devfs-style names in /etc/inittab or /etc/securetty or"
+		ewarn "      your GRUB or LILO kernel boot command line, you need to"
+		ewarn "      change them back to LSB compliant names, as the devfs names are"
+		ewarn "      now gone.  If you wish to use some persistent names for your"
+		ewarn "      block devices, look at the symlinks in /dev/disk/ for the names"
+		ewarn "      you can use."
+		ewarn
+	fi
+
+	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
+
+	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"
+}