Update version. Fix some '==' vs '=' errors with rules file. Add hopeful

sufficient replacement script for depriciated '%e' directive.

6 files changed, 703 insertions, 15 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 74d60da3c8be..3bf455d0aa3c 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # 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.198 2006/06/28 18:27:30 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.199 2006/06/28 20:04:28 azarah Exp $
+
+*udev-094 (28 Jun 2006)
+
+  28 Jun 2006; Martin Schlemmer <azarah@gentoo.org> +files/udev.rules-094,
+  +files/seq_node.sh, +udev-094.ebuild:
+  Update version. Fix some '==' vs '=' errors with rules file. Add hopeful
+  sufficient replacement script for depriciated '%e' directive.
 
   28 Jun 2006; Bryan Østergaard <kloeri@gentoo.org> udev-087-r1.ebuild:
   Stable on alpha.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index ea4d0ca01d07..601dbb619cd1 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,6 +1,3 @@
------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
@@ -9,6 +6,10 @@ AUX 05-udev-early.rules-079 385 RMD160 04de1f937d47a2d42eeec879851a1a00d847cecc
 MD5 c5e955ffa18f2f4526a67c00dbe8b870 files/05-udev-early.rules-079 385
 RMD160 04de1f937d47a2d42eeec879851a1a00d847cecc files/05-udev-early.rules-079 385
 SHA256 c50db994a4a40d6b7aa466944c2ab14a00a6269a2b9f0ae26b1049cf6881b682 files/05-udev-early.rules-079 385
+AUX seq_node.sh 1431 RMD160 49ca665c8b21267aa6e3eab0171932aabc05d26d SHA1 ff76d369d9a399f5b65157abf2199d2f86f61c70 SHA256 fd9203b92c99270a22e3a84482d3455355960bc69a69c767940ba9a82305005d
+MD5 d86d43669ed8c87e2804c497fd094ef7 files/seq_node.sh 1431
+RMD160 49ca665c8b21267aa6e3eab0171932aabc05d26d files/seq_node.sh 1431
+SHA256 fd9203b92c99270a22e3a84482d3455355960bc69a69c767940ba9a82305005d files/seq_node.sh 1431
 AUX udev-021-udev_add_c-gcc295-compat.patch 493 RMD160 b18937882d817963f5434551d60e8e54fc0dbf46 SHA1 8cebae35fdf70987c9bb59b475aabf0cb118a660 SHA256 c6f5914cf44969e597ec97c17e43e5dfdcfb15e1f2afdccf686c55889032f38c
 MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
 RMD160 b18937882d817963f5434551d60e8e54fc0dbf46 files/udev-021-udev_add_c-gcc295-compat.patch 493
@@ -125,6 +126,10 @@ AUX udev.rules-089 12399 RMD160 f78a11d2c1c6a60d5fa364f6041d42df282895f9 SHA1 44
 MD5 71a167b83cc71705a54e31bf52f4ccad files/udev.rules-089 12399
 RMD160 f78a11d2c1c6a60d5fa364f6041d42df282895f9 files/udev.rules-089 12399
 SHA256 754fb764a0ea828a350a019c07dca6cad5bab16cbde4eeab0ee81ccebfe20a09 files/udev.rules-089 12399
+AUX udev.rules-094 12567 RMD160 e905949bcae612ef26be117880125a4c7ad3ae31 SHA1 635c767417a92296ee767c9e984750fc8dbc0a59 SHA256 c96973459dcfa093ab2be66f5b002dd562af444150f8b8bda3ffc724191f4971
+MD5 ca8429e7d9fc41bdd2dcb4f101b0be9a files/udev.rules-094 12567
+RMD160 e905949bcae612ef26be117880125a4c7ad3ae31 files/udev.rules-094 12567
+SHA256 c96973459dcfa093ab2be66f5b002dd562af444150f8b8bda3ffc724191f4971 files/udev.rules-094 12567
 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
@@ -139,12 +144,13 @@ DIST udev-077.tar.bz2 222315 RMD160 c686cc3996bd6fdff53d78c6cbeda46568c4bc11 SHA
 DIST udev-078.tar.bz2 222769
 DIST udev-079.tar.bz2 222080 RMD160 eadf12acb49cf55015031ad540cc399bde6be835 SHA1 03e19c1afaa8abdb31c1f6627179ae37805269f9 SHA256 66b398f6eca47c6c50ae19f9ae4721f2ae57c7686e6f90edc9c72e3780171bcc
 DIST udev-081.tar.bz2 194339 RMD160 2ad57d91751e7c2e225779cf029f082e6c0cfbad SHA256 089ebd9a9ae1fbc5c5c7c3c6d05c51c756c43f14f975a6b9e08b70b3f7dbd493
-DIST udev-084.tar.bz2 190832 RMD160 d93b802a3b2f925ec9ac73045917d335c3044621 SHA256 73ea375a93169423dfca7ca3c125f9d6c422d0dcac917eea53a3217d177be4b4
-DIST udev-085.tar.bz2 191553 RMD160 9f38b00d7f6ba44b0d0a429103250a2d29755db2 SHA256 d99e91b3a033111e37479ad2f85c4d161cb26a9762a4314231b4aba4b3fab3f7
-DIST udev-086.tar.bz2 191824 RMD160 1cc8df74fc476b1123de52e24c2baa42a8b14305 SHA256 98cc9890100cfb5a656ccf5f21a5a8667fbc02f0e85d8a519089785695a1e59d
+DIST udev-084.tar.bz2 190832 RMD160 d93b802a3b2f925ec9ac73045917d335c3044621 SHA1 a3f8e4d331bd16ae06c08d3da7a7dd7bd82cb684 SHA256 73ea375a93169423dfca7ca3c125f9d6c422d0dcac917eea53a3217d177be4b4
+DIST udev-085.tar.bz2 191553 RMD160 9f38b00d7f6ba44b0d0a429103250a2d29755db2 SHA1 a6949fb7259f3b81fe7fb477bfc1b137a984467b SHA256 d99e91b3a033111e37479ad2f85c4d161cb26a9762a4314231b4aba4b3fab3f7
+DIST udev-086.tar.bz2 191824 RMD160 1cc8df74fc476b1123de52e24c2baa42a8b14305 SHA1 b1ab0cb88882b8db9e6783539d3fc7b3d06b2d4a SHA256 98cc9890100cfb5a656ccf5f21a5a8667fbc02f0e85d8a519089785695a1e59d
 DIST udev-087.tar.bz2 190053 RMD160 3eefbc4bb4df3ffe3678cd1a8c57d247d6e59dcd SHA1 4564190ad6d6b38f94effdfe0ef1eebbcef2056b SHA256 d91eac8fad04b27d1146b579e4dc9ed0aee142a35d87af2c683b47ea95d80995
-DIST udev-089.tar.bz2 191032 RMD160 3e845904ce1c24b407c616f0cb024d758a7afbe2 SHA256 cee32e4392d0c3ea84838e98ead8ca2a031c332126e0ff5321b981135b7e76fd
+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
 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
@@ -257,6 +263,10 @@ EBUILD udev-090.ebuild 9713 RMD160 71719422dc61e55d208e5e39373a5e846efd7ec6 SHA1
 MD5 af0949a9b46f1eefe8070907281437d9 udev-090.ebuild 9713
 RMD160 71719422dc61e55d208e5e39373a5e846efd7ec6 udev-090.ebuild 9713
 SHA256 a33ea370e032bba5e2ae244b1cba23d959eda6c56140710598c21f63f74ce544 udev-090.ebuild 9713
+EBUILD udev-094.ebuild 9798 RMD160 712b46a66efe0bb9d185768bdf6221be5fb56574 SHA1 a02a1e02a571ed10321bdfa768ec09ae255d5f81 SHA256 34f0e107103fe5dd18d042e8527846939714ccedc94eb99a48d9730ca8ab19d7
+MD5 333a7861498437c2756f48707ddc715f udev-094.ebuild 9798
+RMD160 712b46a66efe0bb9d185768bdf6221be5fb56574 udev-094.ebuild 9798
+SHA256 34f0e107103fe5dd18d042e8527846939714ccedc94eb99a48d9730ca8ab19d7 udev-094.ebuild 9798
 MISC ChangeLog 35870 RMD160 e243920893b428614674775b897bc240a8eb230b SHA1 676fa467037c06eaeef2992ca696b0b39864cdf2 SHA256 9e70632a4e21d2f72e0266a46849f9a7661b28c578efdd4a606d4c37d4fcfa04
 MD5 e947f38a03cb3297d19d285150692014 ChangeLog 35870
 RMD160 e243920893b428614674775b897bc240a8eb230b ChangeLog 35870
@@ -349,10 +359,6 @@ SHA256 50879961dd1c70fe88683704a50b768edeccbbc018962031a0f4f54f10b6cc6f files/di
 MD5 08479620eba0bf6e20ed51ca3daa2e25 files/digest-udev-090-r1 229
 RMD160 5b046f0c83c87de916417d0852aa47096b1e9418 files/digest-udev-090-r1 229
 SHA256 50879961dd1c70fe88683704a50b768edeccbbc018962031a0f4f54f10b6cc6f files/digest-udev-090-r1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEouZsugEuf3OQ0akRAt9TAJsG4L3EpaQs41Itgkwd5GNoe7krbQCfb0Mv
-gEn9r/6Z/HDPZdTDwhf2/1c=
-=uA9X
------END PGP SIGNATURE-----
+MD5 b5f2c45b72b3e978d0d38e3d1915478f files/digest-udev-094 229
+RMD160 1231b7fa7f5781db4e4427efa4adfeacecdfbe69 files/digest-udev-094 229
+SHA256 2ffa93cdaecf04989e52504888b7927e3c77dc375949d846aff55d786ef37986 files/digest-udev-094 229
diff --git a/sys-fs/udev/files/digest-udev-094 b/sys-fs/udev/files/digest-udev-094
new file mode 100644
index 000000000000..5af53e964b09
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-094
@@ -0,0 +1,3 @@
+MD5 9e525da5c8cce9ed2c6d7812016df1f7 udev-094.tar.bz2 194721
+RMD160 204330e28707e1fa5b699a89e1f663ecfd264e04 udev-094.tar.bz2 194721
+SHA256 a920b3c8126363f9559988e6b68148939ae09d1cccb9573c69a261b23a393590 udev-094.tar.bz2 194721
diff --git a/sys-fs/udev/files/seq_node.sh b/sys-fs/udev/files/seq_node.sh
new file mode 100755
index 000000000000..0419bcc4f789
--- /dev/null
+++ b/sys-fs/udev/files/seq_node.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Author: Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/seq_node.sh,v 1.1 2006/06/28 20:04:28 azarah Exp $
+
+# Stupid little script to emulate the depriciated '%e' directive of udev.
+# I am not sure why its supposidly broken, so this might need fixing if it
+# have the same issue as '%e'.
+#
+# Usage: seq_node.sh <root> <kernel name> <wanted node>
+#
+#  root        - root of udev (usuall /dev)
+#  kernel name - kernel name for device
+#  wanted node - needed free node
+#
+# Example: seq_node.sh %r %k cdrom
+#
+#  If called as above, it should return 'cdrom' if free, else 'cdrom1',
+#  'cdrom2', etc.  It also checks if an existing node was already created for
+#  the specific 'kernel name'.
+#
+
+root=$1
+kname=$2
+node=$3
+
+count=0
+new_node=${node}
+
+if [[ -z ${root} || -z ${kname} || -z ${node} ]] ; then
+	exit 1
+fi
+
+get_filename() {
+	local symlink=$1
+	local filename=
+
+	if type -p readlink &>/dev/null ; then
+		filename=$(readlink "${root}/$1")
+	else
+		filename=`perl -e 'print readlink("${root}/cdrom")' 2>/dev/null`
+	fi
+
+	echo "${filename}"
+}
+
+while [[ -f "${root}/${new_node}" || -L "${root}/${new_node}" ]] ; do
+	# Check if existing node is the same as the kname we are looking
+	# for a new node, and return that instead
+	if [[ $(get_filename "${new_node}") == "${kname}" ]] ; then
+		break
+	fi
+
+	let "count += 1"
+	new_node="${node}${count}"
+done
+
+echo "${new_node}"
+
+exit 0
+
diff --git a/sys-fs/udev/files/udev.rules-094 b/sys-fs/udev/files/udev.rules-094
new file mode 100644
index 000000000000..fcae7b23e7b8
--- /dev/null
+++ b/sys-fs/udev/files/udev.rules-094
@@ -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 (not quite yet...)
+# SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware_helper"
+
+
+# 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-094.ebuild b/sys-fs/udev/udev-094.ebuild
new file mode 100644
index 000000000000..2738cc39724f
--- /dev/null
+++ b/sys-fs/udev/udev-094.ebuild
@@ -0,0 +1,276 @@
+# 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-094.ebuild,v 1.1 2006/06/28 20:04:28 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
+
+	# 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/scsi_id extras/volume_id extras/ata_id extras/run_directory extras/usb_id extras/floppy extras/cdrom_id extras/firmware"
+
+	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=${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"
+	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"
+
+	# 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-094 50-udev.rules
+	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.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-089.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"
+}