Removed all ebuilds older than stable version 104-r12.

(Portage version: 2.1.2.7)

69 files changed, 27 insertions, 9723 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e6b559631fee..99b353a51740 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,32 @@
 # 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.304 2007/05/11 04:25:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.305 2007/05/12 09:39:02 zzam Exp $
+
+  12 May 2007; Matthias Schwarzott <zzam@gentoo.org> -files/udev.rules-018,
+  -files/udev-021-udev_add_c-gcc295-compat.patch,
+  -files/udev-050-udev_volume_id.patch, -files/udev.rules-064-r1,
+  -files/udev.rules-077, -files/udev.rules-077-r1, -files/udev.rules-077-r5,
+  -files/udev-start-077-r2.sh, -files/udev-start-077-r4.sh,
+  -files/udev-start-077.sh, -files/05-udev-early.rules-078,
+  -files/udev.rules-078, -files/05-udev-early.rules-079,
+  -files/udev-start-079.sh, -files/udev.rules-084, -files/udev.rules-089,
+  -files/udev-start-089.sh, -files/udev-start-090.sh, -files/udev.rules-094,
+  -files/udev.rules-096, -files/udev.rules-096-r1,
+  -files/udev-096-udevtrigger.patch, -files/udev-start-096.sh,
+  -files/udev.rules-098, -files/udev-098-udevtrigger.patch,
+  -files/udev-start-098.sh, -files/udev-start-099.sh,
+  -files/udev-start-104-r10.sh, -files/modprobe.sh, -files/udev.conf,
+  -files/udev.conf.post_024, -files/udev.conf.post_046,
+  -files/udev.conf.post_050, -files/udev.conf.post_059,
+  -files/udev.hotplug.empty, -files/udev.permissions, -files/udev.rules,
+  -files/udev.rules.post_012, -files/udev-parisc-path_id.patch,
+  -files/udev-parisc-path_id-again.patch, -files/udev-start.sh,
+  -files/udev-stop.sh, -udev-079-r2.ebuild, -udev-087.ebuild,
+  -udev-087-r1.ebuild, -udev-090-r1.ebuild, -udev-094.ebuild,
+  -udev-096.ebuild, -udev-096-r1.ebuild, -udev-098.ebuild, -udev-099.ebuild,
+  -udev-100.ebuild, -udev-100-r2.ebuild, -udev-103.ebuild,
+  -udev-104-r11.ebuild:
+  Removed all ebuilds older than stable version 104-r12.
 
   11 May 2007; Joshua Kinard <kumba@gentoo.org> udev-104-r12.ebuild:
   Stable on mips, per #159871.
diff --git a/sys-fs/udev/files/05-udev-early.rules-078 b/sys-fs/udev/files/05-udev-early.rules-078
deleted file mode 100644
index 0e10e0547fc3..000000000000
--- a/sys-fs/udev/files/05-udev-early.rules-078
+++ /dev/null
@@ -1,7 +0,0 @@
-# sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",           OPTIONS="ignore_device"
-SUBSYSTEM=="module",            OPTIONS="ignore_device"
-
diff --git a/sys-fs/udev/files/05-udev-early.rules-079 b/sys-fs/udev/files/05-udev-early.rules-079
deleted file mode 100644
index 763e9b761561..000000000000
--- a/sys-fs/udev/files/05-udev-early.rules-079
+++ /dev/null
@@ -1,8 +0,0 @@
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",	OPTIONS="ignore_device"
-SUBSYSTEM=="module",	OPTIONS="ignore_device"
-
-# sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
diff --git a/sys-fs/udev/files/digest-udev-079-r2 b/sys-fs/udev/files/digest-udev-079-r2
deleted file mode 100644
index f8bef847bfa9..000000000000
--- a/sys-fs/udev/files/digest-udev-079-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 981fc92fd2eeb4d4d13c182c447af6bf udev-079.tar.bz2 222080
-RMD160 eadf12acb49cf55015031ad540cc399bde6be835 udev-079.tar.bz2 222080
-SHA256 66b398f6eca47c6c50ae19f9ae4721f2ae57c7686e6f90edc9c72e3780171bcc udev-079.tar.bz2 222080
diff --git a/sys-fs/udev/files/digest-udev-087 b/sys-fs/udev/files/digest-udev-087
deleted file mode 100644
index df46535b9e4b..000000000000
--- a/sys-fs/udev/files/digest-udev-087
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8659e14a4f376b33134c72df180bfbbe udev-087.tar.bz2 190053
-RMD160 3eefbc4bb4df3ffe3678cd1a8c57d247d6e59dcd udev-087.tar.bz2 190053
-SHA256 d91eac8fad04b27d1146b579e4dc9ed0aee142a35d87af2c683b47ea95d80995 udev-087.tar.bz2 190053
diff --git a/sys-fs/udev/files/digest-udev-087-r1 b/sys-fs/udev/files/digest-udev-087-r1
deleted file mode 100644
index df46535b9e4b..000000000000
--- a/sys-fs/udev/files/digest-udev-087-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8659e14a4f376b33134c72df180bfbbe udev-087.tar.bz2 190053
-RMD160 3eefbc4bb4df3ffe3678cd1a8c57d247d6e59dcd udev-087.tar.bz2 190053
-SHA256 d91eac8fad04b27d1146b579e4dc9ed0aee142a35d87af2c683b47ea95d80995 udev-087.tar.bz2 190053
diff --git a/sys-fs/udev/files/digest-udev-090-r1 b/sys-fs/udev/files/digest-udev-090-r1
deleted file mode 100644
index 8e7eae04b7fe..000000000000
--- a/sys-fs/udev/files/digest-udev-090-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 44acf418a23b0be826aa55828ada07db udev-090.tar.bz2 192213
-RMD160 77c1cd3cd71d781daf420824723cc520c75f41c8 udev-090.tar.bz2 192213
-SHA256 fd938b4144093261ed0437a6a7ce167526113ead596059ebae779b3fe219b4b3 udev-090.tar.bz2 192213
diff --git a/sys-fs/udev/files/digest-udev-094 b/sys-fs/udev/files/digest-udev-094
deleted file mode 100644
index 5af53e964b09..000000000000
--- a/sys-fs/udev/files/digest-udev-094
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-udev-096 b/sys-fs/udev/files/digest-udev-096
deleted file mode 100644
index 7068d6b78f90..000000000000
--- a/sys-fs/udev/files/digest-udev-096
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-udev-096-r1 b/sys-fs/udev/files/digest-udev-096-r1
deleted file mode 100644
index 7068d6b78f90..000000000000
--- a/sys-fs/udev/files/digest-udev-096-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-udev-098 b/sys-fs/udev/files/digest-udev-098
deleted file mode 100644
index 131c6feef893..000000000000
--- a/sys-fs/udev/files/digest-udev-098
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd5e254d074d6eed8687acaff92e30e5 udev-098.tar.bz2 195723
-RMD160 29a05c64d49397d345d25f75c916525fede346aa udev-098.tar.bz2 195723
-SHA256 565f3cba2edf87668f503ada3869f4d7ebfa866340cdf2f3ae3d1c319090f0f5 udev-098.tar.bz2 195723
diff --git a/sys-fs/udev/files/digest-udev-099 b/sys-fs/udev/files/digest-udev-099
deleted file mode 100644
index 033167b697c2..000000000000
--- a/sys-fs/udev/files/digest-udev-099
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 930ad7ba1a60b5fed5f1ddf2c7ce02df udev-099.tar.bz2 197429
-RMD160 c323d1f63010d70470872f8b9710cf9ed179643d udev-099.tar.bz2 197429
-SHA256 58a18e38ce9f28886b5b67784cff58ebb96a912bd32d6c32760e189881853bfa udev-099.tar.bz2 197429
diff --git a/sys-fs/udev/files/digest-udev-100 b/sys-fs/udev/files/digest-udev-100
deleted file mode 100644
index b4022f69b57e..000000000000
--- a/sys-fs/udev/files/digest-udev-100
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f1f7e7d8f9a438b7a63d0d6443961d1c udev-100.tar.bz2 197628
-RMD160 110903eda55348131ca412c4f4a9d539e5a35bdb udev-100.tar.bz2 197628
-SHA256 ca1f83735bd9fc70b534c846e4214394f0297f6a32d1d9252e08ad796d0d94b6 udev-100.tar.bz2 197628
diff --git a/sys-fs/udev/files/digest-udev-100-r2 b/sys-fs/udev/files/digest-udev-100-r2
deleted file mode 100644
index b4022f69b57e..000000000000
--- a/sys-fs/udev/files/digest-udev-100-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f1f7e7d8f9a438b7a63d0d6443961d1c udev-100.tar.bz2 197628
-RMD160 110903eda55348131ca412c4f4a9d539e5a35bdb udev-100.tar.bz2 197628
-SHA256 ca1f83735bd9fc70b534c846e4214394f0297f6a32d1d9252e08ad796d0d94b6 udev-100.tar.bz2 197628
diff --git a/sys-fs/udev/files/digest-udev-103 b/sys-fs/udev/files/digest-udev-103
deleted file mode 100644
index 1cb26bcabc2d..000000000000
--- a/sys-fs/udev/files/digest-udev-103
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7360ce47b5ec3f9fa71f18071ecb8b97 udev-103.tar.bz2 200027
-RMD160 3b00a83ad8c538109ee030e2e471422272c7d071 udev-103.tar.bz2 200027
-SHA256 047f5e2895f707117ab726cedd89fd35e8c9105530af54a8038fe81cf61c4e3f udev-103.tar.bz2 200027
diff --git a/sys-fs/udev/files/digest-udev-104-r11 b/sys-fs/udev/files/digest-udev-104-r11
deleted file mode 100644
index 1d88fbeee74a..000000000000
--- a/sys-fs/udev/files/digest-udev-104-r11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 187574
-RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 udev-104.tar.bz2 187574
-SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 udev-104.tar.bz2 187574
diff --git a/sys-fs/udev/files/modprobe.sh b/sys-fs/udev/files/modprobe.sh
deleted file mode 100755
index febf34de36de..000000000000
--- a/sys-fs/udev/files/modprobe.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-: ${VERBOSE:=no}
-[[ -e /dev/.udev_populate ]] && VERBOSE=yes
-
-. /etc/init.d/functions.sh </dev/console
-
-MODPROBE=/sbin/modprobe
-MODLIST=$("${MODPROBE}" -i --show-depends "${@}" | sed "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" | sed 's|-|_|g')
-
-[[ -z ${MODLIST} ]] && exit 0
-for m in ${MODLIST}; do
-	LAST=$m
-done
-
-# check for blacklisting
-if [[ -f /etc/modprobe.conf ]]; then
-	if grep -q '^blacklist.*[[:space:]]'"${LAST}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then
-		# module blacklisted
-		exit 0
-	fi
-fi
-
-if [[ ${VERBOSE} != no ]]; then
-	# print line if not already loaded
-	if ! grep -q "^${LAST}[[:space:]]" /proc/modules; then
-		einfo "  udev loading module ${LAST}" > /dev/console
-	fi
-fi
-
-# now do real loading
-exec "${MODPROBE}" "${@}"
diff --git a/sys-fs/udev/files/udev-021-udev_add_c-gcc295-compat.patch b/sys-fs/udev/files/udev-021-udev_add_c-gcc295-compat.patch
deleted file mode 100644
index 9f106e027273..000000000000
--- a/sys-fs/udev/files/udev-021-udev_add_c-gcc295-compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- udev-021/udev-add.c.orig	2004-03-06 18:38:37.000000000 -0500
-+++ udev-021/udev-add.c	2004-03-06 18:39:05.000000000 -0500
-@@ -226,10 +226,12 @@
- 		if (endptr[0] == '\0')
- 			uid = (uid_t) id;
- 		else {
-+			struct passwd *pw;
-+
- 			if (strncmp(dev->owner, LOCAL_USER, sizeof(LOCAL_USER)) == 0)
- 				set_to_local_user(dev->owner);
- 
--			struct passwd *pw = getpwnam(dev->owner);
-+			pw = getpwnam(dev->owner);
- 			if (pw == NULL)
- 				dbg("specified user unknown '%s'", dev->owner);
- 			else
diff --git a/sys-fs/udev/files/udev-050-udev_volume_id.patch b/sys-fs/udev/files/udev-050-udev_volume_id.patch
deleted file mode 100644
index e741cdf9a146..000000000000
--- a/sys-fs/udev/files/udev-050-udev_volume_id.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-===== extras/volume_id/udev_volume_id.c 1.6 vs edited =====
---- 1.6/extras/volume_id/udev_volume_id.c	2004-12-08 11:35:29 -08:00
-+++ edited/extras/volume_id/udev_volume_id.c	2004-12-17 22:16:14 -08:00
-@@ -37,7 +37,6 @@
- #define BLKGETSIZE64 _IOR(0x12,114,size_t)
- 
- #ifdef LOG
--unsigned char logname[LOGNAME_SIZE];
- void log_message(int level, const char *format, ...)
- {
- 	va_list args;
diff --git a/sys-fs/udev/files/udev-096-udevtrigger.patch b/sys-fs/udev/files/udev-096-udevtrigger.patch
deleted file mode 100644
index b3b0c714ed52..000000000000
--- a/sys-fs/udev/files/udev-096-udevtrigger.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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-098-udevtrigger.patch b/sys-fs/udev/files/udev-098-udevtrigger.patch
deleted file mode 100644
index 7aaa410ac703..000000000000
--- a/sys-fs/udev/files/udev-098-udevtrigger.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/udevtrigger.c b/udevtrigger.c
-index 09ef60a..9479caa 100644
---- a/udevtrigger.c
-+++ b/udevtrigger.c
-@@ -358,6 +358,9 @@ int main(int argc, char *argv[], char *e
- {
- 	int i;
- 	int failed = 0;
-+	int block = 1;
-+	int bus = 1;
-+	int class = 1;
- 
- 	logging_init("udevtrigger");
- 	udev_config_init();
-@@ -373,8 +376,15 @@ int main(int argc, char *argv[], char *e
- 			dry_run = 1;
- 		} else if (strcmp(arg, "--retry-failed") == 0 || strcmp(arg, "-F") == 0) {
- 			failed = 1;
-+		} else if (strcmp(arg, "--no-scan-block") == 0) {
-+			block = 0;
-+		} else if (strcmp(arg, "--no-scan-bus") == 0) {
-+			bus = 0;
-+		} else if (strcmp(arg, "--no-scan-class") == 0) {
-+			class = 0;
- 		} else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
--			printf("Usage: udevtrigger [--help] [--verbose] [--dry-run] [--retry-failed]\n");
-+			printf("Usage: udevtrigger [--no-scan-block] [--no-scan-bus] [--no-scan-class]\n");
-+			printf("                   [--help] [--verbose] [--dry-run] [--retry-failed]\n");
- 			goto exit;
- 		} else {
- 			fprintf(stderr, "unrecognized option '%s'\n", arg);
-@@ -386,9 +396,12 @@ int main(int argc, char *argv[], char *e
- 		scan_failed();
- 	else {
- 		/* default action */
--		scan_bus();
--		scan_class();
--		scan_block();
-+		if (bus)
-+			scan_bus();
-+		if (class)
-+			scan_class();
-+		if (block)
-+			scan_block();
- 	}
- 	exec_lists();
- 
diff --git a/sys-fs/udev/files/udev-parisc-path_id-again.patch b/sys-fs/udev/files/udev-parisc-path_id-again.patch
deleted file mode 100644
index 502d7766a997..000000000000
--- a/sys-fs/udev/files/udev-parisc-path_id-again.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jeroen Roovers <jer@gentoo.org>
-Subject: fix typo in parisc support to path_id
-
-As reported at http://bugs.gentoo.org/show_bug.cgi?id=113379 path_id is
-still broken for parisc boxes.  This patch from Jeroen Roovers
-<jer@gentoo.org> fixes that.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
---- a/extras/path_id
-+++ b/extras/path_id
-@@ -229,7 +229,7 @@ handle_block_scsi () {
- 		;;
- 		# PARISC devices
- 		*parisc*)
--		adapter="${controler_dev##*/}"
-+		adapter="${controller_dev##*/}"
- 		bus=parisc;
- 		;;
- 		*)
diff --git a/sys-fs/udev/files/udev-parisc-path_id.patch b/sys-fs/udev/files/udev-parisc-path_id.patch
deleted file mode 100644
index 7fd55082a770..000000000000
--- a/sys-fs/udev/files/udev-parisc-path_id.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jeroen Roovers <jer@gentoo.org>
-Subject: add parisc support to path_id
-
-As reported at http://bugs.gentoo.org/show_bug.cgi?id=113379 path_id doesn't
-work too well for parisc boxes.  This patch from Jeroen Roovers
-<jer@gentoo.org> fixes that.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
-diff --git a/extras/path_id b/extras/path_id
-index 4ac7187..dfb997b 100755
---- a/extras/path_id
-+++ b/extras/path_id
-@@ -235,6 +235,11 @@ handle_block_scsi () {
- 		adapter="`echo $controller_dev |  sed -e 's@/[^/]\{1,\}$@@;s@^.*/@@;s@^.*:@@'`"
- 		bus="gc"
- 		;;
-+		# PARISC devices
-+		*parisc*)
-+		adapter="${controler_dev##*/}"
-+		bus=parisc;
-+		;;
- 		*)
- 		adapter="${controller_dev##*/}"
- 		bus="pci"
diff --git a/sys-fs/udev/files/udev-start-077-r2.sh b/sys-fs/udev/files/udev-start-077-r2.sh
deleted file mode 100644
index 59c52af2ae12..000000000000
--- a/sys-fs/udev/files/udev-start-077-r2.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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}"
-}
-
-# This works for 2.6.15 kernels or greater
-trigger_events() {
-	list=""
-	# if you want real coldplug (with all modules being loaded for all
-	# devices in the system), uncomment out the next line.
-	#list="$list $(echo /sys/bus/*/devices/*/uevent)"
-	list="$list $(echo /sys/class/*/*/uevent)"
-	list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
-	for i in $list; do
-		case "$i" in
-			*/device/uevent)
-				# skip followed device symlinks
-				continue
-				;;
-			*/class/mem/*|*/class/tty/*)
-				first="$first $i"
-				;;
-			*/block/md*)
-				last="$last $i"
-				;;
-			*/*)
-				default="$default $i"
-				;;
-		esac
-	done
-
-	# trigger the sorted events
-	for i in $first $default $last; do
-		echo "add" > "$i"
-	done
-}
-
-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"
-		trigger_events
-		eend 0
-	else
-		ebegin "Populating /dev with existing devices with udevstart"
-		/sbin/udevstart
-		eend 0
-	fi
-
-	# loop until everything is finished
-	# there's gotta be a better way...
-	ebegin "Letting udev process events"
-	loop=0
-	while test -d /dev/.udev/queue; do
-		sleep 0.1;
-		test "$loop" -gt 300 && break
-		loop=$(($loop + 1))
-	done
-	#einfo "loop = $loop"
-	eend 0
-
-	ebegin "Finalizing udev configuration"
-
-	# 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 nodes that udev can't
-	[[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null
-	[[ -x /sbin/lvm ]] && \
-		/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
-	[[ -x /sbin/evms_activate ]] && /sbin/evms_activate -q &>/dev/null
-
-	# Create problematic directories
-	mkdir -p /dev/{pts,shm}
-
-	# copy over any persistant things
-	cp --preserve=all --recursive --update /lib/udev/devices/* /dev
-
-	# Same thing as /dev/.devfsd
-	touch /dev/.udev
-	eend 0
-
-	return 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
-			if egrep -qs tmpfs /proc/filesystems ; 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 $?
-
-		# 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
-
-		# Setup hotplugging (if possible)
-		ebegin "Setting up proper hotplug agent"
-		if [[ -e /proc/sys/kernel/hotplug ]] ; then
-			if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then
-				einfo "  Using netlink for hotplug events..."
-				echo "" > /proc/sys/kernel/hotplug
-			elif [[ $(udev_version) -ge "48" ]] ; then
-				einfo "  Setting /sbin/udevsend as hotplug agent ..."
-				echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
-			elif [[ -x /sbin/hotplug ]] ; then
-				einfo "  Using /sbin/hotplug as hotplug agent ..."
-			else
-				einfo "  Setting /sbin/udev as hotplug agent ..."
-				echo "/sbin/udev" > /proc/sys/kernel/hotplug
-			fi
-		fi
-		eend 0
-
-		ebegin "Starting udevd"
-		/sbin/udevd --daemon
-		eend $?
-
-		populate_udev
-}
-
-main
-
-
-# vim:ts=4
diff --git a/sys-fs/udev/files/udev-start-077-r4.sh b/sys-fs/udev/files/udev-start-077-r4.sh
deleted file mode 100644
index 73a645ee9551..000000000000
--- a/sys-fs/udev/files/udev-start-077-r4.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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}"
-}
-
-# This works for 2.6.15 kernels or greater
-trigger_events() {
-	list=""
-	# if you want real coldplug (with all modules being loaded for all
-	# devices in the system), uncomment out the next line.
-	#list="$list $(echo /sys/bus/*/devices/*/uevent)"
-	list="$list $(echo /sys/class/*/*/uevent)"
-	list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
-	for i in $list; do
-		case "$i" in
-			*/device/uevent)
-				# skip followed device symlinks
-				continue
-				;;
-			*/class/mem/*|*/class/tty/*)
-				first="$first $i"
-				;;
-			*/block/md*)
-				last="$last $i"
-				;;
-			*/*)
-				default="$default $i"
-				;;
-		esac
-	done
-
-	# trigger the sorted events
-	for i in $first $default $last; do
-		echo "add" > "$i"
-	done
-}
-
-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"
-		trigger_events
-		eend 0
-	else
-		ebegin "Populating /dev with existing devices with udevstart"
-		/sbin/udevstart
-		eend 0
-	fi
-
-	# loop until everything is finished
-	# there's gotta be a better way...
-	ebegin "Letting udev process events"
-	loop=0
-	while test -d /dev/.udev/queue; do
-		sleep 0.1;
-		test "$loop" -gt 300 && break
-		loop=$(($loop + 1))
-	done
-	#einfo "loop = $loop"
-	eend 0
-
-	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
-	cp --preserve=all --recursive --update /lib/udev/devices/* /dev
-
-	# 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
-		if egrep -qs tmpfs /proc/filesystems ; 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 $?
-
-	# 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)
-	ebegin "Setting up proper hotplug agent"
-	if [[ -e /proc/sys/kernel/hotplug ]] ; then
-		if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then
-			einfo "  Using netlink for hotplug events..."
-			echo "" > /proc/sys/kernel/hotplug
-		elif [[ $(udev_version) -ge "48" ]] ; then
-			einfo "  Setting /sbin/udevsend as hotplug agent ..."
-			echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
-		elif [[ -x /sbin/hotplug ]] ; then
-			einfo "  Using /sbin/hotplug as hotplug agent ..."
-		else
-			einfo "  Setting /sbin/udev as hotplug agent ..."
-			echo "/sbin/udev" > /proc/sys/kernel/hotplug
-		fi
-	fi
-	eend 0
-
-	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
-	[[ -x /sbin/evms_activate ]] && /sbin/evms_activate -q &>/dev/null
-	eend 0
-
-	# Same thing as /dev/.devfsd
-	touch /dev/.udev
-}
-
-main
-
-
-# vim:ts=4
diff --git a/sys-fs/udev/files/udev-start-077.sh b/sys-fs/udev/files/udev-start-077.sh
deleted file mode 100755
index dee600ccf19c..000000000000
--- a/sys-fs/udev/files/udev-start-077.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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() {
-	# Now populate /dev
-	/sbin/udevstart
-
-	# 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 nodes that udev can't
-	[[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null
-	[[ -x /sbin/lvm ]] && \
-		/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
-	[[ -x /sbin/evms_activate ]] && /sbin/evms_activate -q &>/dev/null
-
-	# Create problematic directories
-	mkdir -p /dev/{pts,shm}
-
-	# Same thing as /dev/.devfsd
-	touch /dev/.udev
-
-	return 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
-			if egrep -qs tmpfs /proc/filesystems ; 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 $?
-
-		# 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
-		ebegin "Configuring system to use udev"
-		if [[ ${RC_DEVICE_TARBALL} == "yes" && \
-		      -s /lib/udev-state/devices.tar.bz2 ]] ; then
-			einfo "  Populating /dev with device nodes ..."
-			try tar -jxpf /lib/udev-state/devices.tar.bz2 -C /dev
-		fi
-
-		einfo "  Starting udevd ..."
-		/sbin/udevd --daemon
-
-		einfo "  Populating /dev with existing devices ..."
-		populate_udev
-
-		# Setup hotplugging (if possible)
-		if [[ -e /proc/sys/kernel/hotplug ]] ; then
-			if [[ $(udev_version) -ge "48" ]] ; then
-				einfo "  Setting /sbin/udevsend as hotplug agent ..."
-				echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
-			elif [[ -x /sbin/hotplug ]] ; then
-				einfo "  Using /sbin/hotplug as hotplug agent ..."
-			else
-				einfo "  Setting /sbin/udev as hotplug agent ..."
-				echo "/sbin/udev" > /proc/sys/kernel/hotplug
-			fi
-		fi
-		eend 0
-}
-
-main
-
-
-# vim:ts=4
diff --git a/sys-fs/udev/files/udev-start-079.sh b/sys-fs/udev/files/udev-start-079.sh
deleted file mode 100644
index 47fa7a5dbd49..000000000000
--- a/sys-fs/udev/files/udev-start-079.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-# 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}"
-}
-
-# This works for 2.6.15 kernels or greater
-trigger_events() {
-	list=""
-	# if you want real coldplug (with all modules being loaded for all
-	# devices in the system), uncomment out the next line.
-	#list="$list $(echo /sys/bus/*/devices/*/uevent)"
-	list="$list $(echo /sys/class/*/*/uevent)"
-	list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
-	for i in $list; do
-		case "$i" in
-			*/device/uevent)
-				# skip followed device symlinks
-				continue
-				;;
-			*/class/mem/*|*/class/tty/*)
-				first="$first $i"
-				;;
-			*/block/md*)
-				last="$last $i"
-				;;
-			*/*)
-				default="$default $i"
-				;;
-		esac
-	done
-
-	# trigger the sorted events
-	for i in $first $default $last; do
-		echo "add" > "$i"
-	done
-}
-
-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"
-		trigger_events
-		eend 0
-	else
-		ebegin "Populating /dev with existing devices with udevstart"
-		/sbin/udevstart
-		eend 0
-	fi
-
-	# loop until everything is finished
-	# there's gotta be a better way...
-	ebegin "Letting udev process events"
-	loop=0
-	while test -d /dev/.udev/queue; do
-		sleep 0.1;
-		test "$loop" -gt 300 && break
-		loop=$(($loop + 1))
-	done
-	#einfo "loop = $loop"
-	eend 0
-
-	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
-	cp --preserve=all --recursive --update /lib/udev/devices/* /dev
-
-	# 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
-		if egrep -qs tmpfs /proc/filesystems ; 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)
-	ebegin "Setting up proper hotplug agent"
-	if [[ -e /proc/sys/kernel/hotplug ]] ; then
-		if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then
-			einfo "  Using netlink for hotplug events..."
-			echo "" > /proc/sys/kernel/hotplug
-		elif [[ $(udev_version) -ge "48" ]] ; then
-			einfo "  Setting /sbin/udevsend as hotplug agent ..."
-			echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
-		elif [[ -x /sbin/hotplug ]] ; then
-			einfo "  Using /sbin/hotplug as hotplug agent ..."
-		else
-			einfo "  Setting /sbin/udev as hotplug agent ..."
-			echo "/sbin/udev" > /proc/sys/kernel/hotplug
-		fi
-	fi
-	eend 0
-
-	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-start-089.sh b/sys-fs/udev/files/udev-start-089.sh
deleted file mode 100644
index ab1c226d250b..000000000000
--- a/sys-fs/udev/files/udev-start-089.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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}"
-}
-
-# This works for 2.6.15 kernels or greater
-trigger_events() {
-	list=""
-	# if you want real coldplug (with all modules being loaded for all
-	# devices in the system), uncomment out the next line.
-	#list="$list $(echo /sys/bus/*/devices/*/uevent)"
-	list="$list $(echo /sys/class/*/*/uevent)"
-	list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
-	for i in $list; do
-		case "$i" in
-			*/device/uevent)
-				# skip followed device symlinks
-				continue
-				;;
-			*/class/mem/*|*/class/tty/*)
-				first="$first $i"
-				;;
-			*/block/md*)
-				last="$last $i"
-				;;
-			*/*)
-				default="$default $i"
-				;;
-		esac
-	done
-
-	# trigger the sorted events
-	for i in $first $default $last; do
-		echo "add" > "$i"
-	done
-}
-
-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"
-		udevtrigger
-		eend 0
-	else
-		ebegin "Populating /dev with existing devices with udevstart"
-		/sbin/udevstart
-		eend 0
-	fi
-
-	# loop until everything is finished
-	# there's gotta be a better way...
-	ebegin "Letting udev process events"
-	loop=0
-	while test -d /dev/.udev/queue; do
-		sleep 0.1;
-		test "$loop" -gt 300 && break
-		loop=$(($loop + 1))
-	done
-	#einfo "loop = $loop"
-	eend 0
-
-	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
-		if egrep -qs tmpfs /proc/filesystems ; 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)
-	ebegin "Setting up proper hotplug agent"
-	if [[ -e /proc/sys/kernel/hotplug ]] ; then
-		if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then
-			einfo "  Using netlink for hotplug events..."
-			echo "" > /proc/sys/kernel/hotplug
-		elif [[ $(udev_version) -ge "48" ]] ; then
-			einfo "  Setting /sbin/udevsend as hotplug agent ..."
-			echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
-		elif [[ -x /sbin/hotplug ]] ; then
-			einfo "  Using /sbin/hotplug as hotplug agent ..."
-		else
-			einfo "  Setting /sbin/udev as hotplug agent ..."
-			echo "/sbin/udev" > /proc/sys/kernel/hotplug
-		fi
-	fi
-	eend 0
-
-	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-start-090.sh b/sys-fs/udev/files/udev-start-090.sh
deleted file mode 100644
index 58bb4c8b2855..000000000000
--- a/sys-fs/udev/files/udev-start-090.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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"
-		udevtrigger
-		eend 0
-	else
-		ebegin "Populating /dev with existing devices with udevstart"
-		/sbin/udevstart
-		eend 0
-	fi
-
-	# loop until everything is finished
-	# there's gotta be a better way...
-	ebegin "Letting udev process events"
-	udevsettle
-#	loop=0
-#	while test -d /dev/.udev/queue; do
-#		sleep 0.1;
-#		test "$loop" -gt 300 && break
-#		loop=$(($loop + 1))
-#	done
-	#einfo "loop = $loop"
-	eend 0
-
-	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
-		if egrep -qs tmpfs /proc/filesystems ; 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)
-	ebegin "Setting up proper hotplug agent"
-	if [[ -e /proc/sys/kernel/hotplug ]] ; then
-		if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then
-			einfo "  Using netlink for hotplug events..."
-			echo "" > /proc/sys/kernel/hotplug
-		elif [[ $(udev_version) -ge "48" ]] ; then
-			einfo "  Setting /sbin/udevsend as hotplug agent ..."
-			echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
-		elif [[ -x /sbin/hotplug ]] ; then
-			einfo "  Using /sbin/hotplug as hotplug agent ..."
-		else
-			einfo "  Setting /sbin/udev as hotplug agent ..."
-			echo "/sbin/udev" > /proc/sys/kernel/hotplug
-		fi
-	fi
-	eend 0
-
-	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-start-096.sh b/sys-fs/udev/files/udev-start-096.sh
deleted file mode 100644
index e9bac6030d2e..000000000000
--- a/sys-fs/udev/files/udev-start-096.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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-start-098.sh b/sys-fs/udev/files/udev-start-098.sh
deleted file mode 100644
index 49e34f86fe73..000000000000
--- a/sys-fs/udev/files/udev-start-098.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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-start-099.sh b/sys-fs/udev/files/udev-start-099.sh
deleted file mode 100644
index 04fee642e4f3..000000000000
--- a/sys-fs/udev/files/udev-start-099.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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="--attr-match=dev"
-		 /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-start-104-r10.sh b/sys-fs/udev/files/udev-start-104-r10.sh
deleted file mode 100644
index 67ffaacb7c0c..000000000000
--- a/sys-fs/udev/files/udev-start-104-r10.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-udev_version() {
-	# Version number copied in by ebuild
-	local version=@@UDEV_VERSION@@
-	version=${version##0}
-
-	echo "${version}"
-}
-
-populate_udev() {
-	# populate /dev with devices already found by the kernel
-	touch /dev/.udev_populate
-	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="--attr-match=dev"
-		 /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 $?
-
-	rm /dev/.udev_populate
-	return 0
-}
-
-seed_dev() {
-	# Seed /dev with some things that we know we need
-	ebegin "Seeding /dev with needed nodes"
-
-	# if /dev/console is missing on root-partition,
-	# kernel could not open it and we need to do that for
-	# udevd (Bug #151414)
-	mknod /dev/console c 5 1
-
-	# udevd will dup its stdin/stdout/stderr to /dev/null
-	# and we do not want a file which gets buffered in ram
-	mknod /dev/null c 1 3
-
-	# copy over any persistant things
-	if [[ -d /lib/udev/devices ]] ; then
-		cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null
-	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() {
-	# check if /dev/console exists outside tmpfs
-	[[ -c /dev/console ]] ; local need_redirect=$?
-
-	# 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"
-	if [[ ${need_redirect} == 1 ]]; then
-		# we need to open fds 0 1 2 to solve Bug #151414
-		/sbin/udevd --daemon </dev/console >/dev/console 2>/dev/console
-	else
-		/sbin/udevd --daemon
-	fi
-	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-start.sh b/sys-fs/udev/files/udev-start.sh
deleted file mode 100755
index 07519188eed2..000000000000
--- a/sys-fs/udev/files/udev-start.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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() {
-	# Now populate /dev
-	/sbin/udevstart
-
-	# 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 nodes that udev can't
-	[[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null
-	[[ -x /sbin/lvm ]] && \
-		/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
-	[[ -x /sbin/evms_activate ]] && /sbin/evms_activate -q &>/dev/null
-
-	# Create problematic directories
-	mkdir -p /dev/{pts,shm}
-
-	# Same thing as /dev/.devfsd
-	touch /dev/.udev
-
-	return 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
-			if egrep -qs tmpfs /proc/filesystems ; 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 $?
-
-		# 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
-		ebegin "Configuring system to use udev"
-		if [[ ${RC_DEVICE_TARBALL} == "yes" && \
-		      -s /lib/udev-state/devices.tar.bz2 ]] ; then
-			einfo "  Populating /dev with device nodes ..."
-			try tar -jxpf /lib/udev-state/devices.tar.bz2 -C /dev
-		fi
-		populate_udev
-
-		# Setup hotplugging (if possible)
-		if [[ -e /proc/sys/kernel/hotplug ]] ; then
-			if [[ $(udev_version) -ge "48" ]] ; then
-				einfo "  Setting /sbin/udevsend as hotplug agent ..."
-				echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
-			elif [[ -x /sbin/hotplug ]] ; then
-				einfo "  Using /sbin/hotplug as hotplug agent ..."
-			else
-				einfo "  Setting /sbin/udev as hotplug agent ..."
-				echo "/sbin/udev" > /proc/sys/kernel/hotplug
-			fi
-		fi
-		eend 0
-}
-
-main
-
-
-# vim:ts=4
diff --git a/sys-fs/udev/files/udev-stop.sh b/sys-fs/udev/files/udev-stop.sh
deleted file mode 100755
index e031cd7b8fca..000000000000
--- a/sys-fs/udev/files/udev-stop.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-main() {
-	if [[ -e /dev/.devfsd || ! -e /dev/.udev || ! -z ${CDBOOT} || \
-	   ${RC_DEVICE_TARBALL} != "yes" ]] || \
-	   ! touch /lib/udev-state/devices.tar.bz2 2>/dev/null
-	then
-		return 0
-	fi
-		
-	ebegin "Saving device nodes"
-	# Handle our temp files
-	devices_udev=$(mktemp /tmp/devices.udev.XXXXXX)
-	devices_real=$(mktemp /tmp/devices.real.XXXXXX)
-	devices_totar=$(mktemp /tmp/devices.totar.XXXXXX)
-	device_tarball=$(mktemp /tmp/devices-XXXXXX)
-	
-	if [[ -z ${devices_udev} || -z ${devices_real} || \
-	      -z ${devices_totar} || -z ${device_tarball} ]] ; then
-		eend 1 "Could not create temporary files!"
-	else
-		cd /dev
-		# Find all devices
-		find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- > \
-			"${devices_real}"
-		# Figure out what udev created
-		eval $(grep '^[[:space:]]*udev_db=' /etc/udev/udev.conf)
-		if [[ -d ${udev_db} ]]; then
-			# New udev_db is clear text ...
-			udevinfo=$(cat "${udev_db}"/*)
-		else
-			# Old one is not ...
-			udevinfo=$(udevinfo -d)
-		fi
-		# This basically strips 'S:' and 'N:' from the db output, and then
-		# print all the nodes/symlinks udev created ...
-		echo "${udevinfo}" | gawk '
-			/^(N|S):.+/ {
-				sub(/^(N|S):/, "")
-				split($0, nodes)
-				for (x in nodes)
-					print nodes[x]
-			}' > "${devices_udev}"
-		# These ones we also do not want in there
-		for x in MAKEDEV core fd initctl pts shm stderr stdin stdout; do
-			echo "${x}" >> "${devices_udev}"
-		done
-		fgrep -x -v -f "${devices_udev}" < "${devices_real}" > "${devices_totar}"
-		# Now only tarball those not created by udev if we have any
-		if [[ -s ${devices_totar} ]]; then
-			# we dont want to descend into mounted filesystems (e.g. devpts)
-			# looking up username may involve NIS/network, and net may be down
-			tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}"
-			mv -f "${device_tarball}" /lib/udev-state/devices.tar.bz2
-		else
-			rm -f /lib/udev-state/devices.tar.bz2
-		fi
-		eend 0
-	fi
-
-	rm -f "${devices_udev}" "${devices_real}" "${devices_totar}" "${device_tarball}"
-}
-
-main
-
-
-# vim:ts=4
diff --git a/sys-fs/udev/files/udev.conf b/sys-fs/udev/files/udev.conf
deleted file mode 100644
index 0489594063df..000000000000
--- a/sys-fs/udev/files/udev.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/udev/udev.conf:  main config file for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf,v 1.3 2004/01/29 18:39:19 azarah Exp $
-#
-# This file can be used to override some of udev's default values
-# for where it looks for files, and where it places device nodes.
-
-
-# udev_root - where in the filesystem to place the device nodes
-udev_root="/dev/"
-
-# udev_db - The name and location of the udev database.
-#           NOTE: this should be somewhere that is writable before
-#                 / is mounted rw, like /dev ...
-udev_db="/dev/.udev.tdb"
-
-# udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/udev.rules"
-
-# udev_permissions - The name and location of the udev permission file
-udev_permissions="/etc/udev/udev.permissions"
-
-# default_mode - set the default mode for all nodes that have no 
-#                explicit match in the permissions file
-#                NOTE: do not set to anything else if you are not
-#                      sure you have everything needed for normal
-#                      user to function in the permissions file!
-default_mode="0666"
-
-# udev_log - set to "yes" if you want logging
-udev_log="no"
-
diff --git a/sys-fs/udev/files/udev.conf.post_024 b/sys-fs/udev/files/udev.conf.post_024
deleted file mode 100644
index 49dfcdb0939b..000000000000
--- a/sys-fs/udev/files/udev.conf.post_024
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/udev/udev.conf:  main config file for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_024,v 1.2 2004/06/07 22:36:18 gregkh Exp $
-#
-# This file can be used to override some of udev's default values
-# for where it looks for files, and where it places device nodes.
-
-
-# udev_root - where in the filesystem to place the device nodes
-udev_root="/dev/"
-
-# udev_db - The name and location of the udev database.
-#           NOTE: this should be somewhere that is writable before
-#                 / is mounted rw, like /dev ...
-udev_db="/dev/.udev.tdb"
-
-# udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/rules.d/"
-
-# udev_permissions - The name and location of the udev permission file
-udev_permissions="/etc/udev/permissions.d/"
-
-# default_mode - set the default mode for all nodes that have no 
-#                explicit match in the permissions file
-#                NOTE: do not set to anything else if you are not
-#                      sure you have everything needed for normal
-#                      user to function in the permissions file!
-default_mode="0660"
-
-# udev_log - set to "yes" if you want logging
-udev_log="no"
-
diff --git a/sys-fs/udev/files/udev.conf.post_046 b/sys-fs/udev/files/udev.conf.post_046
deleted file mode 100644
index 37d3239ade3b..000000000000
--- a/sys-fs/udev/files/udev.conf.post_046
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/udev/udev.conf:  main config file for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_046,v 1.1 2004/11/18 22:03:35 gregkh Exp $
-#
-# This file can be used to override some of udev's default values
-# for where it looks for files, and where it places device nodes.
-
-
-# udev_root - where in the filesystem to place the device nodes
-udev_root="/dev/"
-
-# udev_db - The name and location of the udev database.
-#           NOTE: this should be somewhere that is writable before
-#                 / is mounted rw, like /dev ...
-udev_db="/dev/.udevdb"
-
-# udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/rules.d/"
-
-# udev_permissions - The name and location of the udev permission file
-udev_permissions="/etc/udev/permissions.d/"
-
-# default_mode - set the default mode for all nodes that have no 
-#                explicit match in the permissions file
-#                NOTE: do not set to anything else if you are not
-#                      sure you have everything needed for normal
-#                      user to function in the permissions file!
-default_mode="0660"
-
-# udev_log - set to "yes" if you want logging
-udev_log="no"
-
diff --git a/sys-fs/udev/files/udev.conf.post_050 b/sys-fs/udev/files/udev.conf.post_050
deleted file mode 100644
index ab43e85a515c..000000000000
--- a/sys-fs/udev/files/udev.conf.post_050
+++ /dev/null
@@ -1,28 +0,0 @@
-# /etc/udev/udev.conf:  main config file for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_050,v 1.1 2005/02/04 03:07:19 gregkh Exp $
-#
-# This file can be used to override some of udev's default values
-# for where it looks for files, and where it places device nodes.
-
-
-# udev_root - where in the filesystem to place the device nodes
-udev_root="/dev/"
-
-# udev_db - The name and location of the udev database.
-#           NOTE: this should be somewhere that is writable before
-#                 / is mounted rw, like /dev ...
-udev_db="/dev/.udevdb"
-
-# udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/rules.d/"
-
-# default_mode - set the default mode for all nodes that have no 
-#                explicit match in the permissions file
-#                NOTE: do not set to anything else if you are not
-#                      sure you have everything needed for normal
-#                      user to function in the permissions file!
-default_mode="0660"
-
-# udev_log - set to "yes" if you want logging
-udev_log="no"
-
diff --git a/sys-fs/udev/files/udev.conf.post_059 b/sys-fs/udev/files/udev.conf.post_059
deleted file mode 100644
index 84b81b29f20c..000000000000
--- a/sys-fs/udev/files/udev.conf.post_059
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/udev/udev.conf:  main config file for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_059,v 1.1 2005/07/03 07:11:11 gregkh Exp $
-#
-# This file can be used to override some of udev's default values
-# for where it looks for files, and where it places device nodes.
-
-
-# udev_root - where in the filesystem to place the device nodes
-udev_root="/dev/"
-
-# udev_db - The name and location of the udev database.
-#           NOTE: this should be somewhere that is writable before
-#                 / is mounted rw, like /dev ...
-udev_db="/dev/.udevdb"
-
-# udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/rules.d/"
-
-# udev_log - set to "yes" if you want logging
-udev_log="no"
-
diff --git a/sys-fs/udev/files/udev.hotplug.empty b/sys-fs/udev/files/udev.hotplug.empty
deleted file mode 100644
index e177f2bcf323..000000000000
--- a/sys-fs/udev/files/udev.hotplug.empty
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# delete me, this file does not need to be here!!!
-#
-# stupid portage handling of /etc files...
diff --git a/sys-fs/udev/files/udev.permissions b/sys-fs/udev/files/udev.permissions
deleted file mode 100644
index 8b17d20797b4..000000000000
--- a/sys-fs/udev/files/udev.permissions
+++ /dev/null
@@ -1,194 +0,0 @@
-# /etc/udev/udev.permissions:  permission/ownership map for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.permissions,v 1.3 2004/01/01 03:41:24 azarah Exp $
-
-# console devices
-console:root:tty:0600
-tty[0-9][0-9]*:root:tty:0660
-vc/[0-9]*:root:tty:0660
-
-# pty devices
-#  Set this to 0660 if you only want users belonging to tty group
-#  to be able to allocate PTYs
-ptmx:root:tty:0666
-pty[p-za-e][0-9a-f]*:root:tty:0660
-tty[p-za-e][0-9a-f]*:root:tty:0660
-pty/m*:root:tty:0660
-vc/s*:root:tty:0660
-
-# serial+dialup devices
-ttyS*:root:tty:0660
-ippp*:root:tty:0660
-isdn*:root:tty:0660
-isdnctrl*:root:tty:0660
-capi*:root:tty:0660
-dcbri*:root:tty:0660
-ircomm*:root:tty:0660
-ttyUSB*:root:usb:0660
-tts/[0-9]*:root:tty:0660
-tts/USB[0-9]*:root:usb:0660
-
-# vc devices
-vcs:root:root:0600
-vcs[0-9]*:root:root:0600
-vcsa:root:root:0600
-vcsa[0-9]*:root:root:0600
-vcc/*:root:root:0600
-
-# memory devices
-random:root:root:0666
-urandom:root:root:0444
-mem:root:kmem:0640
-kmem:root:kmem:0640
-port:root:kmem:0640
-full:root:root:0666
-null:root:root:0666
-zero:root:root:0666
-
-# misc devices
-nvram:root:root:0660
-rtc:root:root:0660
-
-# floppy devices
-fd[01]*:root:floppy:0660
-
-# audio devices
-dsp*:root:audio:0660
-audio*:root:audio:0660
-midi*:root:audio:0660
-mixer*:root:audio:0660
-sequencer*:root:audio:0660
-sound/*:root:audio:0660
-snd/*:root:audio:0660
-beep:root:audio:0660
-admm*:root:audio:0660
-adsp*:root:audio:0660
-aload*:root:audio:0660
-amidi*:root:audio:0660
-dmfm*:root:audio:0660
-dmmidi*:root:audio:0660
-sndstat:root:audio:0660
-
-# optical devices
-sr*:root:cdrom:660
-scd*:root:cdrom:660
-pcd*:root:cdrom:0660
-cdrom*:root:cdrom:0660
-dvd:root:cdrom:0660
-rdvd:root:cdrom:0660
-cdroms/*:root:cdrom:0660
-
-# pilot/palm devices
-pilot:root:uucp:0660
-
-# jaz devices
-jaz*:root:disk:0660
-
-# zip devices
-pocketzip*:root:disk:0660
-zip*:root:disk:0660
-
-# ls120 devices
-ls120:root:disk:0660
-ls120*:root:disk:0660
-
-# lp devices
-lp*:root:lp:0660
-parport*:root:lp:0660
-irlpt*:root:lp:0660
-usblp*:root:lp:0660
-usb/lp*:root:lp:0660
-
-# scanner devices
-scanner:root:root:0600
-usb/scanner*:root:root:0600
-
-# camera devices
-camera*:root:root:0600
-usb/dc2xx*:root:root:0600
-usb/mdc800*:root:root:0600
-
-# raw devices
-ram*:root:disk:660
-raw/*:root:disk:660
-
-# disk devices
-hd*:root:disk:660
-sd*:root:disk:660
-dasd*:root:disk:660
-ataraid*:root:disk:660
-loop*:root:disk:660
-md*:root:disk:660
-ide/*/*/*/*/*:root:disk:660
-discs/*/*:root:disk:660
-loop/*:root:disk:660
-md/*:root:disk:660
-
-# tape devices
-ht*:root:tape:0660
-nht*:root:tape:0660
-pt[0-9]*:root:tape:0660
-npt*:root:tape:0660
-st*:root:tape:0660
-nst*:root:tape:0660
-
-# dm devices
-dm-*:root:root:0640
-
-# memstick devices
-memstick*:root:root:0600
-
-# flash devices
-flash*:root:root:0600
-
-# diskonkey devices
-diskonkey*:root:disk:0660
-
-# rem_ide devices
-microdrive*:root:disk:0660
-
-# fb devices
-fb:root:root:0600
-fb[0-9]*:root:root:0600
-fb/*:root:root:0600
-
-# kbd devices
-kbd:root:root:0644
-
-# joystick devices
-js[0-9]*:root:root:0644
-djs[0-9]*:root:root:0644
-
-# v4l devices
-video*:root:video:0660
-radio*:root:video:0660
-winradio*:root:video:0660
-vtx*:root:video:0660
-vbi*:root:video:0660
-video/*:root:video:0660
-vttuner:root:video:0660
-v4l/*:root:video:0660
-
-# input devices
-input/*:root:root:644
-
-# gpm devices
-gpmctl:root:root:0700
-
-# dri devices
-nvidia*:root:video:0660
-3dfx*:root:video:0660
-dri/*:root:video:0660
-
-# mainboard devices
-apm_bios:root:root:0600
-
-# scsi devices
-sg*:root:disk:0660
-pg*:root:disk:0660
-cdwriter:root:disk:0660
-
-# usb devices
-usb/dabusb*:root:usb:0660
-usb/mdc800*:root:usb:0660
-usb/rio500:root:usb:0660
-
diff --git a/sys-fs/udev/files/udev.rules b/sys-fs/udev/files/udev.rules
deleted file mode 100644
index 360c5565687d..000000000000
--- a/sys-fs/udev/files/udev.rules
+++ /dev/null
@@ -1,97 +0,0 @@
-# /etc/udev/udev.rules:  device naming rules for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules,v 1.1 2003/12/26 23:32:44 azarah Exp $
-#
-# There are a number of modifiers that are allowed to be used in the NAME or PROGRAM fields.
-# They provide the following subsitutions:
-# %n - the "kernel number" of the device.
-#      for example, 'sda3' has a "kernel number" of '3'
-# %k - the kernel name for the device.
-# %M - the kernel major number for the device
-# %m - the kernel minor number for the device
-# %b - the bus id for the device
-# %c - the return value for the CALLOUT program (note, this doesn't work within
-#      the PROGRAM field for the obvious reason.)
-# %D - use the devfs style disk name for this device.
-#      For partitions, this will result in 'part%n'
-#      If this is not a partition, it will result in 'disc'
-#
-
-###########################################################
-#
-# Add your own rules here
-#
-###########################################################
-
-# Looking for scsi bus id 42:0:0:1
-CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n test-%b", ID="test-42:0:0:1", NAME="%c"
-
-# A usb camera.
-LABEL, BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n"
-
-# USB Epson printer to be called lp_epson
-LABEL, BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
-
-# USB HP printer to be called lp_hp
-LABEL, BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp"
-
-# sound card with PCI bus id 00:0b.0 to be the first sound card
-NUMBER, BUS="pci", ID="00:0b.0", NAME="dsp"
-
-# sound card with PCI bus id 00:07.1 to be the second sound card
-NUMBER, BUS="pci", ID="00:07.1", NAME="dsp1"
-
-# USB mouse plugged into the third port of the first hub to be called mouse0
-TOPOLOGY, BUS="usb", PLACE="1.3", NAME="mouse0"
-
-# USB tablet plugged into the third port of the second hub to be called mouse1
-TOPOLOGY, BUS="usb", PLACE="2.3", NAME="mouse1"
-TOPOLOGY, BUS="usb", PLACE="2.4", NAME="mouse2"
-
-# ttyUSB1 should always be called visor
-REPLACE, KERNEL="ttyUSB1", NAME="visor"
-REPLACE, KERNEL="ttyUSB0", NAME="pl2303"
-
-
-###########################################################
-#
-# For devfs similar /dev layout (neater)
-#
-###########################################################
-
-# devfs-names for ide-devices (uncomment only one)
-#  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-CALLOUT, BUS="ide", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c"
- 
-# fb devices
-REPLACE, KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
-
-# loop devices
-REPLACE, KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
-
-# md block devices
-REPLACE, KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
-
-# pty devices
-REPLACE, KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
-REPLACE, KERNEL="tty[p-za-e][0-9a-f]*", NAME="tty/s%n", SYMLINK="%k"
-
-# ram devices
-REPLACE, KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
-
-# tty devices
-REPLACE, KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
-REPLACE, KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
-REPLACE, KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
-
-# vc devices
-REPLACE, KERNEL="vcs",        NAME="vcc/0", SYMLINK="%k"
-REPLACE, KERNEL="vcs[0-9]*",  NAME="vcc/%n", SYMLINK="%k"
-REPLACE, KERNEL="vcsa",       NAME="vcc/a0", SYMLINK="%k"
-REPLACE, KERNEL="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
-
-# v4l devices
-REPLACE, KERNEL="video[0-9]*", NAME="v4l/video%n"
-REPLACE, KERNEL="radio[0-9]*", NAME="v4l/radio%n"
-REPLACE, KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
-REPLACE, KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
-
diff --git a/sys-fs/udev/files/udev.rules-018 b/sys-fs/udev/files/udev.rules-018
deleted file mode 100644
index cd66de84f307..000000000000
--- a/sys-fs/udev/files/udev.rules-018
+++ /dev/null
@@ -1,129 +0,0 @@
-# /etc/udev/udev.rules:  device naming rules for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules-018,v 1.2 2004/02/29 11:07:39 azarah Exp $
-#
-# 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.
-
-###########################################################
-#
-# Add your own rules here (examples are commented)
-#
-###########################################################
-
-# Looking for scsi bus id 42:0:0:1
-#BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
-
-# A usb camera.
-#BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n"
-
-# USB Epson printer to be called lp_epson
-#BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
-
-# USB HP printer to be called lp_hp
-#BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp"
-
-# sound card with PCI bus id 00:0b.0 to be the first sound card
-#BUS="pci", ID="00:0b.0", NAME="dsp"
-
-# sound card with PCI bus id 00:07.1 to be the second sound card
-#BUS="pci", ID="00:07.1", NAME="dsp1"
-
-# USB mouse plugged into the third port of the first hub to be called mouse0
-#BUS="usb", PLACE="1.3", NAME="mouse0"
-
-# USB tablet plugged into the third port of the second hub to be called mouse1
-#BUS="usb", PLACE="2.3", NAME="mouse1"
-#BUS="usb", PLACE="2.4", NAME="mouse2"
-
-# ttyUSB1 should always be called visor
-#KERNEL="ttyUSB1", NAME="visor"
-#KERNEL="ttyUSB0", NAME="pl2303"
-
-
-###########################################################
-#
-# For devfs similar /dev layout (neater)
-#
-###########################################################
-
-# devfs-names for ide-devices (uncomment only one)
-#  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
-
-# alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*",     NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
-KERNEL="midi[CD0-9]*",   NAME="snd/%k"
-KERNEL="timer",          NAME="snd/%k"
-KERNEL="seq",            NAME="snd/%k"
-
-# dm devices (ignore them)
-KERNEL="dm-[0-9]*",     NAME=""
-# 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"
-
-# floppy devices
-KERNEL="fd[0-9]*", NAME="floppy/%n", SYMLINK="%k"
-
-# i2c devices
-KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
-
-# input devices
-KERNEL="mice",        NAME="input/mice"
-KERNEL="mouse[0-9]*", NAME="input/mouse%n"
-KERNEL="event[0-9]*", NAME="input/event%n"
-KERNEL="js*",         NAME="input/%k"
-KERNEL="ts*",         NAME="input/%k"
-
-# loop devices
-KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
-
-# md block devices
-KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
-
-# misc devices
-KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
-KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="uinput",  NAME="misc/%k", SYMLINK="%k"
-
-# pty devices
-KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
-KERNEL="tty[p-za-e][0-9a-f]*", NAME="tty/s%n", SYMLINK="%k"
-
-# ramdisk devices
-KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
-
-# sound devices
-KERNEL="adsp",       NAME="sound/adsp",       SYMLINK="%k"
-KERNEL="audio",      NAME="sound/audio",      SYMLINK="%k"
-KERNEL="dsp",        NAME="sound/dsp",        SYMLINK="%k"
-KERNEL="mixer",      NAME="sound/mixer",      SYMLINK="%k"
-KERNEL="sequencer",  NAME="sound/sequencer",  SYMLINK="%k"
-KERNEL="sequencer2", NAME="sound/sequencer2", SYMLINK="%k"
-
-# tty devices
-KERNEL="tty[0-9]*",    NAME="vc/%n",  SYMLINK="%k"
-KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k"
-KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
-
-# vc devices
-KERNEL="vcs",        NAME="vcc/0",   SYMLINK="%k"
-KERNEL="vcs[0-9]*",  NAME="vcc/%n",  SYMLINK="%k"
-KERNEL="vcsa",       NAME="vcc/a0",  SYMLINK="%k"
-KERNEL="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
-
-# v4l devices
-KERNEL="video[0-9]*", NAME="v4l/video%n"
-KERNEL="radio[0-9]*", NAME="v4l/radio%n"
-KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
-KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
-
diff --git a/sys-fs/udev/files/udev.rules-064-r1 b/sys-fs/udev/files/udev.rules-064-r1
deleted file mode 100644
index 75c192ffaa27..000000000000
--- a/sys-fs/udev/files/udev.rules-064-r1
+++ /dev/null
@@ -1,252 +0,0 @@
-# /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="tts/%n", SYMLINK+="%k", GROUP="tty"
-KERNEL=="ttyUSB[0-9]*",	NAME="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]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-BUS=="scsi", KERNEL="sr[0-9]*", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-BUS=="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-
-# devfs-names for ide-devices (uncomment only one)
-#  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS=="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK+="%c{1} %c{2}", GROUP="%c{3}"
-
-# 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*",	PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida*",		PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-
-# mylex
-KERNEL=="rd*",		PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%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"
-
-# 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", 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
-KERNEL=="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c", GROUP="video", MODE="0660"
-
-# 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"
-
-# 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"
-
-# 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"
-
-# always run /etc/dev.d/ stuff for now.
-RUN+="/sbin/udev_run_devd"
-
diff --git a/sys-fs/udev/files/udev.rules-077 b/sys-fs/udev/files/udev.rules-077
deleted file mode 100644
index 615dc04ae9da..000000000000
--- a/sys-fs/udev/files/udev.rules-077
+++ /dev/null
@@ -1,307 +0,0 @@
-# /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="tts/%n", SYMLINK+="%k", GROUP="tty"
-KERNEL=="ttyUSB[0-9]*",	NAME="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"
-ENV{ID_CDROM}=="?*",		SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	SYMLINK+="cdrw%e"
-ENV{ID_CDROM_DVD}=="?*",	SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*",	SYMLINK+="dvdrw%e"
-
-# 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*",	PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-
-# mylex
-KERNEL=="rd*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%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"
-
-# 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", 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/%%i $${K%%%%.*} $${K#*.}'", NAME="%c"
-
-# 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"
-
-# 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"
-
-
-# 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"
-
-# always run /etc/dev.d/ stuff for now.
-RUN+="/sbin/udev_run_devd"
-
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
diff --git a/sys-fs/udev/files/udev.rules-077-r1 b/sys-fs/udev/files/udev.rules-077-r1
deleted file mode 100644
index 6614c7639484..000000000000
--- a/sys-fs/udev/files/udev.rules-077-r1
+++ /dev/null
@@ -1,308 +0,0 @@
-# /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="tts/%n", SYMLINK+="%k", GROUP="tty"
-KERNEL=="ttyUSB[0-9]*",	NAME="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}=="?*",		SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	SYMLINK+="cdrw%e"
-ENV{ID_CDROM_DVD}=="?*",	SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*",	SYMLINK+="dvdrw%e"
-
-# 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*",	PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-
-# mylex
-KERNEL=="rd*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%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"
-
-# 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/%%i $${K%%%%.*} $${K#*.}'", NAME="%c"
-
-# 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"
-
-# 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"
-
-
-# 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"
-
-# always run /etc/dev.d/ stuff for now.
-RUN+="/sbin/udev_run_devd"
-
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
diff --git a/sys-fs/udev/files/udev.rules-077-r5 b/sys-fs/udev/files/udev.rules-077-r5
deleted file mode 100644
index b77f019560be..000000000000
--- a/sys-fs/udev/files/udev.rules-077-r5
+++ /dev/null
@@ -1,308 +0,0 @@
-# /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}=="?*",		SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	SYMLINK+="cdrw%e"
-ENV{ID_CDROM_DVD}=="?*",	SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*",	SYMLINK+="dvdrw%e"
-
-# 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*",	PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-
-# mylex
-KERNEL=="rd*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%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"
-
-# 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"
-
-# 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"
-
-# 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"
-
-
-# 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"
-
-# always run /etc/dev.d/ stuff for now.
-RUN+="/sbin/udev_run_devd"
-
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
diff --git a/sys-fs/udev/files/udev.rules-078 b/sys-fs/udev/files/udev.rules-078
deleted file mode 100644
index 315dd33d9507..000000000000
--- a/sys-fs/udev/files/udev.rules-078
+++ /dev/null
@@ -1,308 +0,0 @@
-# /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}=="?*",		SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	SYMLINK+="cdrw%e"
-ENV{ID_CDROM_DVD}=="?*",	SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*",	SYMLINK+="dvdrw%e"
-
-# 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*",	PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-
-# mylex
-KERNEL=="rd*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%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"
-
-# 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"
-
-
-# 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"
-
-# always run /etc/dev.d/ stuff for now.
-RUN+="/sbin/udev_run_devd"
-
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
diff --git a/sys-fs/udev/files/udev.rules-084 b/sys-fs/udev/files/udev.rules-084
deleted file mode 100644
index 24f67be85aa0..000000000000
--- a/sys-fs/udev/files/udev.rules-084
+++ /dev/null
@@ -1,309 +0,0 @@
-# /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}=="?*",		SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	SYMLINK+="cdrw%e"
-ENV{ID_CDROM_DVD}=="?*",	SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*",	SYMLINK+="dvdrw%e"
-
-# 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*",	PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-
-# mylex
-KERNEL=="rd*",		PROGRAM="raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%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"
-
-
-# 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/files/udev.rules-089 b/sys-fs/udev/files/udev.rules-089
deleted file mode 100644
index a464ed8e90cf..000000000000
--- a/sys-fs/udev/files/udev.rules-089
+++ /dev/null
@@ -1,334 +0,0 @@
-# /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}=="?*",		SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	SYMLINK+="cdrw%e"
-ENV{ID_CDROM_DVD}=="?*",	SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*",	SYMLINK+="dvdrw%e"
-
-# 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/files/udev.rules-094 b/sys-fs/udev/files/udev.rules-094
deleted file mode 100644
index fcae7b23e7b8..000000000000
--- a/sys-fs/udev/files/udev.rules-094
+++ /dev/null
@@ -1,334 +0,0 @@
-# /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/files/udev.rules-096 b/sys-fs/udev/files/udev.rules-096
deleted file mode 100644
index 02ff38b9a9fe..000000000000
--- a/sys-fs/udev/files/udev.rules-096
+++ /dev/null
@@ -1,334 +0,0 @@
-# /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/files/udev.rules-096-r1 b/sys-fs/udev/files/udev.rules-096-r1
deleted file mode 100644
index e1ff2ef31f0d..000000000000
--- a/sys-fs/udev/files/udev.rules-096-r1
+++ /dev/null
@@ -1,334 +0,0 @@
-# /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="cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL=="sg[0-9]*", ACTION=="add", DRIVER=="sr", GROUP="cdrom"
-ENV{ID_CDROM}=="?*",		PROGRAM="seq_node.sh %r %k cdrom", SYMLINK+="%c", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	PROGRAM="seq_node.sh %r %k cdrw",  SYMLINK+="%c"
-ENV{ID_CDROM_DVD}=="?*",	PROGRAM="seq_node.sh %r %k dvd",   SYMLINK+="%c"
-ENV{ID_CDROM_DVD_R}=="?*",	PROGRAM="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="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="usb_id -x"
-KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="scsi_id -g -x -s %p -d %N"
-KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="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="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="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+="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+="udev_run_hotplugd $env{SUBSYSTEM}"
-
-# always run /etc/dev.d/ stuff for now.
-RUN+="udev_run_devd $env{SUBSYSTEM}"
-
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
diff --git a/sys-fs/udev/files/udev.rules-098 b/sys-fs/udev/files/udev.rules-098
deleted file mode 100644
index bc1c84d4e525..000000000000
--- a/sys-fs/udev/files/udev.rules-098
+++ /dev/null
@@ -1,283 +0,0 @@
-# /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="cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL=="sg[0-9]*", ACTION=="add", DRIVERS=="sr", GROUP="cdrom"
-ENV{ID_CDROM}=="?*",		PROGRAM="seq_node.sh %r %k cdrom", SYMLINK+="%c", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	PROGRAM="seq_node.sh %r %k cdrw",  SYMLINK+="%c"
-ENV{ID_CDROM_DVD}=="?*",	PROGRAM="seq_node.sh %r %k dvd",   SYMLINK+="%c"
-ENV{ID_CDROM_DVD_R}=="?*",	PROGRAM="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"
-
-
-# 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+="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+="udev_run_hotplugd $env{SUBSYSTEM}"
-
-# always run /etc/dev.d/ stuff for now.
-RUN+="udev_run_devd $env{SUBSYSTEM}"
-
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
diff --git a/sys-fs/udev/files/udev.rules.post_012 b/sys-fs/udev/files/udev.rules.post_012
deleted file mode 100644
index 7b35d08a465d..000000000000
--- a/sys-fs/udev/files/udev.rules.post_012
+++ /dev/null
@@ -1,126 +0,0 @@
-# /etc/udev/udev.rules:  device naming rules for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules.post_012,v 1.5 2004/02/08 16:59:29 azarah Exp $
-#
-# 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.
-
-###########################################################
-#
-# Add your own rules here (examples are commented)
-#
-###########################################################
-
-# Looking for scsi bus id 42:0:0:1
-#BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
-
-# A usb camera.
-#BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n"
-
-# USB Epson printer to be called lp_epson
-#BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
-
-# USB HP printer to be called lp_hp
-#BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp"
-
-# sound card with PCI bus id 00:0b.0 to be the first sound card
-#BUS="pci", ID="00:0b.0", NAME="dsp"
-
-# sound card with PCI bus id 00:07.1 to be the second sound card
-#BUS="pci", ID="00:07.1", NAME="dsp1"
-
-# USB mouse plugged into the third port of the first hub to be called mouse0
-#BUS="usb", PLACE="1.3", NAME="mouse0"
-
-# USB tablet plugged into the third port of the second hub to be called mouse1
-#BUS="usb", PLACE="2.3", NAME="mouse1"
-#BUS="usb", PLACE="2.4", NAME="mouse2"
-
-# ttyUSB1 should always be called visor
-#KERNEL="ttyUSB1", NAME="visor"
-#KERNEL="ttyUSB0", NAME="pl2303"
-
-
-###########################################################
-#
-# For devfs similar /dev layout (neater)
-#
-###########################################################
-
-# devfs-names for ide-devices (uncomment only one)
-#  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c"
-
-# alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*",     NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
-KERNEL="midi[CD0-9]*",   NAME="snd/%k"
-KERNEL="timer",          NAME="snd/%k"
-KERNEL="seq",            NAME="snd/%k"
-
-# dm devices (ignore them)
-KERNEL="dm-[0-9]*",     NAME=""
-KERNEL="device-mapper", NAME="mapper/control"
-
-# fb devices
-KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
-
-# floppy devices
-KERNEL="fd[0-9]*", NAME="floppy/%n", SYMLINK="%k"
-
-# i2c devices
-KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
-
-# input devices
-KERNEL="mice",        NAME="input/mice"
-KERNEL="mouse[0-9]*", NAME="input/mouse%n"
-KERNEL="event[0-9]*", NAME="input/event%n"
-KERNEL="js*",         NAME="input/%k"
-KERNEL="ts*",         NAME="input/%k"
-
-# loop devices
-KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
-
-# md block devices
-KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
-
-# misc devices
-KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
-KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="uinput",  NAME="misc/%k", SYMLINK="%k"
-
-# pty devices
-KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
-KERNEL="tty[p-za-e][0-9a-f]*", NAME="tty/s%n", SYMLINK="%k"
-
-# ramdisk devices
-KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
-
-# sound devices
-KERNEL="adsp",       NAME="sound/adsp"        SYMLINK="%k"
-KERNEL="audio",      NAME="sound/audio",      SYMLINK="%k"
-KERNEL="dsp",        NAME="sound/dsp",        SYMLINK="%k"
-KERNEL="mixer",      NAME="sound/mixer",      SYMLINK="%k"
-KERNEL="sequencer",  NAME="sound/sequencer",  SYMLINK="%k"
-KERNEL="sequencer2", NAME="sound/sequencer2", SYMLINK="%k"
-
-# tty devices
-KERNEL="tty[0-9]*",    NAME="vc/%n",  SYMLINK="%k"
-KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k"
-KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
-
-# vc devices
-KERNEL="vcs",        NAME="vcc/0",   SYMLINK="%k"
-KERNEL="vcs[0-9]*",  NAME="vcc/%n",  SYMLINK="%k"
-KERNEL="vcsa",       NAME="vcc/a0",  SYMLINK="%k"
-KERNEL="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
-
-# v4l devices
-KERNEL="video[0-9]*", NAME="v4l/video%n"
-KERNEL="radio[0-9]*", NAME="v4l/radio%n"
-KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
-KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
-
diff --git a/sys-fs/udev/udev-079-r2.ebuild b/sys-fs/udev/udev-079-r2.ebuild
deleted file mode 100644
index 673061d577b8..000000000000
--- a/sys-fs/udev/udev-079-r2.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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-079-r2.ebuild,v 1.2 2007/03/27 20:44:50 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-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="sys-apps/hotplug-base"
-RDEPEND="${DEPEND}
-	>=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}" != "f849a8ebf727167fddbc763ade8c0405" ]
-	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}-
-
-	# 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
-	dobin udevtest
-	dobin udevmonitor
-	into /
-	dosbin udev
-	dosbin udevd
-	dosbin udevsend
-	dosbin udevstart
-	dosbin udevcontrol
-	dosbin extras/run_directory/udev_run_devd
-	dosbin extras/run_directory/udev_run_hotplugd
-	dosbin extras/ata_id/ata_id
-	dosbin extras/volume_id/vol_id
-	dosbin extras/scsi_id/scsi_id
-	dosbin extras/usb_id/usb_id
-	dosbin extras/cdrom_id/cdrom_id
-	dosbin extras/path_id
-	dosbin extras/floppy/create_floppy_devices
-	dosbin extras/firmware/firmware_helper
-
-	#exeinto /etc/udev/scripts
-	exeinto /lib/udev
-	#doexe extras/ide-devfs.sh
-	#doexe extras/scsi-devfs.sh
-	doexe extras/raid-devfs.sh
-
-	# Our udev config file
-	insinto /etc/udev
-	newins ${FILESDIR}/udev.conf.post_059 udev.conf
-
-	# Our rules files
-	insinto /etc/udev/rules.d/
-	#newins etc/udev/gentoo/udev.rules 50-udev.rules
-	newins ${FILESDIR}/udev.rules-078 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 *.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 /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-079.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
-
-	# 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 ${D}/lib/udev/devices
-
-	mknod ${D}/lib/udev/devices/null c 1 3
-	chmod 666 ${D}/lib/udev/devices/null
-	touch -t 200010220101 ${D}/lib/udev/devices/null
-
-	mknod ${D}/lib/udev/devices/zero c 1 5
-	chmod 666 ${D}/lib/udev/devices/zero
-	touch -t 200010220101 ${D}/lib/udev/devices/zero
-
-	mknod ${D}/lib/udev/devices/console c 5 1
-	chmod 600 ${D}/lib/udev/devices/console
-	chown root:tty ${D}/lib/udev/devices/console
-	touch -t 200010220101 ${D}/lib/udev/devices/console
-}
-
-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
-}
-
-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...
-	ewarn "Note: If you are upgrading from a version of udev prior to 046"
-	ewarn "      and 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
-	ewarn "Note: If you are upgrading from a version of udev prior to 050"
-	ewarn "      and 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
-	ewarn "Note: If you are upgrading from a version of udev prior to 057"
-	ewarn "      and 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
-	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
-	ewarn "Note: If you are upgrading from a version of udev prior to 063"
-	ewarn "      and 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."
-
-	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"
-}
diff --git a/sys-fs/udev/udev-087-r1.ebuild b/sys-fs/udev/udev-087-r1.ebuild
deleted file mode 100644
index 3678724fce7d..000000000000
--- a/sys-fs/udev/udev-087-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# 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-087-r1.ebuild,v 1.4 2007/03/27 20:44:50 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-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="sys-apps/hotplug-base"
-RDEPEND="${DEPEND}
-	>=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}-
-
-	# 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
-	dobin udevtest
-	dobin udevmonitor
-	into /
-	dosbin udev
-	dosbin udevd
-	dosbin udevsend
-	dosbin udevstart
-	dosbin udevcontrol
-	dosbin extras/run_directory/udev_run_devd
-	dosbin extras/run_directory/udev_run_hotplugd
-	dosbin extras/ata_id/ata_id
-	dosbin extras/volume_id/vol_id
-	dosbin extras/scsi_id/scsi_id
-	dosbin extras/usb_id/usb_id
-	dosbin extras/cdrom_id/cdrom_id
-	dosbin extras/path_id
-	dosbin extras/floppy/create_floppy_devices
-	dosbin extras/firmware/firmware_helper
-
-	#exeinto /etc/udev/scripts
-	exeinto /lib/udev
-	#doexe extras/ide-devfs.sh
-	#doexe extras/scsi-devfs.sh
-	doexe extras/raid-devfs.sh
-
-	# 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-084 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 /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-079.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
-
-	# 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 ${D}/lib/udev/devices
-
-	mknod ${D}/lib/udev/devices/null c 1 3
-	chmod 666 ${D}/lib/udev/devices/null
-	touch -t 200010220101 ${D}/lib/udev/devices/null
-
-	mknod ${D}/lib/udev/devices/zero c 1 5
-	chmod 666 ${D}/lib/udev/devices/zero
-	touch -t 200010220101 ${D}/lib/udev/devices/zero
-
-	mknod ${D}/lib/udev/devices/console c 5 1
-	chmod 600 ${D}/lib/udev/devices/console
-	chown root:tty ${D}/lib/udev/devices/console
-	touch -t 200010220101 ${D}/lib/udev/devices/console
-}
-
-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
-}
-
-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
-
-	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"
-}
diff --git a/sys-fs/udev/udev-087.ebuild b/sys-fs/udev/udev-087.ebuild
deleted file mode 100644
index 1bf9279ef2a8..000000000000
--- a/sys-fs/udev/udev-087.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# 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-087.ebuild,v 1.11 2007/03/27 20:44:50 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-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="sys-apps/hotplug-base"
-RDEPEND="${DEPEND}
-	>=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}-
-
-	# 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
-	dobin udevtest
-	dobin udevmonitor
-	into /
-	dosbin udev
-	dosbin udevd
-	dosbin udevsend
-	dosbin udevstart
-	dosbin udevcontrol
-	dosbin extras/run_directory/udev_run_devd
-	dosbin extras/run_directory/udev_run_hotplugd
-	dosbin extras/ata_id/ata_id
-	dosbin extras/volume_id/vol_id
-	dosbin extras/scsi_id/scsi_id
-	dosbin extras/usb_id/usb_id
-	dosbin extras/cdrom_id/cdrom_id
-	dosbin extras/path_id
-	dosbin extras/floppy/create_floppy_devices
-	dosbin extras/firmware/firmware_helper
-
-	#exeinto /etc/udev/scripts
-	exeinto /lib/udev
-	#doexe extras/ide-devfs.sh
-	#doexe extras/scsi-devfs.sh
-	doexe extras/raid-devfs.sh
-
-	# 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-084 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 /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-079.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
-
-	# 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 ${D}/lib/udev/devices
-
-	mknod ${D}/lib/udev/devices/null c 1 3
-	chmod 666 ${D}/lib/udev/devices/null
-	touch -t 200010220101 ${D}/lib/udev/devices/null
-
-	mknod ${D}/lib/udev/devices/zero c 1 5
-	chmod 666 ${D}/lib/udev/devices/zero
-	touch -t 200010220101 ${D}/lib/udev/devices/zero
-
-	mknod ${D}/lib/udev/devices/console c 5 1
-	chmod 600 ${D}/lib/udev/devices/console
-	chown root:tty ${D}/lib/udev/devices/console
-	touch -t 200010220101 ${D}/lib/udev/devices/console
-}
-
-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
-}
-
-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
-
-	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"
-}
diff --git a/sys-fs/udev/udev-090-r1.ebuild b/sys-fs/udev/udev-090-r1.ebuild
deleted file mode 100644
index 699cd53630c2..000000000000
--- a/sys-fs/udev/udev-090-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# 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-090-r1.ebuild,v 1.7 2007/03/27 20:44:50 zzam Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-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_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"
-	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_helper		|| 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-089 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 /$(get_libdir)/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"
-}
diff --git a/sys-fs/udev/udev-094.ebuild b/sys-fs/udev/udev-094.ebuild
deleted file mode 100644
index dd29ff21eb81..000000000000
--- a/sys-fs/udev/udev-094.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# 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-094.ebuild,v 1.4 2007/03/27 20:44:50 zzam Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-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_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"
-	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 /$(get_libdir)/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"
-}
diff --git a/sys-fs/udev/udev-096-r1.ebuild b/sys-fs/udev/udev-096-r1.ebuild
deleted file mode 100644
index 83cd5859855e..000000000000
--- a/sys-fs/udev/udev-096-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# 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-096-r1.ebuild,v 1.4 2007/03/27 20:44:50 zzam Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-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
-	exeinto /lib/udev
-	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
-	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
-	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/dasd_id/dasd_id	|| die "Required helper not installed properly"
-	doexe 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-r1 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 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 /$(get_libdir)/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
-
-	# 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
-
-	# 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"
-}
diff --git a/sys-fs/udev/udev-096.ebuild b/sys-fs/udev/udev-096.ebuild
deleted file mode 100644
index 7c42121818c2..000000000000
--- a/sys-fs/udev/udev-096.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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-096.ebuild,v 1.3 2007/03/27 20:44:50 zzam Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-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 /$(get_libdir)/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"
-}
diff --git a/sys-fs/udev/udev-098.ebuild b/sys-fs/udev/udev-098.ebuild
deleted file mode 100644
index 226f11f12df1..000000000000
--- a/sys-fs/udev/udev-098.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# 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-098.ebuild,v 1.3 2007/03/27 20:44:50 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"
-
-# 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
-	exeinto /$(get_libdir)/udev
-	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
-	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
-	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/dasd_id/dasd_id	|| die "Required helper not installed properly"
-	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
-	keepdir /$(get_libdir)/udev/state
-
-	# 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-098 50-udev.rules
-	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules
-	# Use upstream's persistent rules for devices
-	doins etc/udev/rules.d/60-*.rules
-
-	# scsi_id configuration
-	insinto /etc
-	doins extras/scsi_id/scsi_id.config
-
-	# 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 /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-098.sh udev-start.sh
-	doins "${FILESDIR}"/udev-stop.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
-
-}
-
-pkg_preinst() {
-	if [[ -d ${ROOT}/$(get_libdir)/udev-state ]] ; then
-		mv -f "${ROOT}"/$(get_libdir)/udev-state/* "${D}"/$(get_libdir)/udev/state/
-		rm -r "${ROOT}"/$(get_libdir)/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
-
-	# 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
-
-	if [ ! -e ${ROOT}/lib/udev/devices/urandom ] ; then
-	    mknod ${ROOT}/lib/udev/devices/urandom c 1 9
-	fi
-	chmod 666 ${ROOT}/lib/udev/devices/urandom
-	touch -t 200010220101 ${ROOT}/lib/udev/devices/urandom
-}
-
-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"
-}
diff --git a/sys-fs/udev/udev-099.ebuild b/sys-fs/udev/udev-099.ebuild
deleted file mode 100644
index e9b65cdcdd75..000000000000
--- a/sys-fs/udev/udev-099.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# 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-099.ebuild,v 1.3 2007/03/27 20:44:50 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"
-
-# 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}" != "295a9b7bdc8bdb239f8860d14af761b0" ]
-	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
-	exeinto /$(get_libdir)/udev
-	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
-	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
-	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/dasd_id/dasd_id	|| die "Required helper not installed properly"
-	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
-	keepdir /$(get_libdir)/udev/state
-
-	# 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-098 50-udev.rules
-	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules
-	# Use upstream's persistent rules for devices
-	doins etc/udev/rules.d/60-*.rules
-
-	# scsi_id configuration
-	insinto /etc
-	doins extras/scsi_id/scsi_id.config
-
-	# 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
-	# create a extra symlink for udevcontrol
-	ln -s "${D}"/usr/share/man/man8/udevd.8.gz \
-		"${D}"/usr/share/man/man8/udevcontrol.8.gz
-
-	# our udev hooks into the rc system
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-099.sh udev-start.sh
-	doins "${FILESDIR}"/udev-stop.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
-
-}
-
-pkg_preinst() {
-	if [[ -d ${ROOT}/$(get_libdir)/udev-state ]] ; then
-		mv -f "${ROOT}"/$(get_libdir)/udev-state/* "${D}"/$(get_libdir)/udev/state/
-		rm -r "${ROOT}"/$(get_libdir)/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
-
-	# 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
-
-	if [ ! -e ${ROOT}/lib/udev/devices/urandom ] ; then
-	    mknod ${ROOT}/lib/udev/devices/urandom c 1 9
-	fi
-	chmod 666 ${ROOT}/lib/udev/devices/urandom
-	touch -t 200010220101 ${ROOT}/lib/udev/devices/urandom
-}
-
-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"
-}
diff --git a/sys-fs/udev/udev-100-r2.ebuild b/sys-fs/udev/udev-100-r2.ebuild
deleted file mode 100644
index 87bc61a1ef63..000000000000
--- a/sys-fs/udev/udev-100-r2.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# 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-100-r2.ebuild,v 1.4 2007/03/27 20:44:50 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"
-
-# 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}" != "295a9b7bdc8bdb239f8860d14af761b0" ]
-	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 \
-				  extras/rule_generator"
-
-	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 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"
-
-	# need to keep this until /sbin/rc stops checking for its presence, it's
-	# really not needed for us to work properly at all.
-	dosbin udev			|| die "Required binary not installed properly"
-
-	# Helpers
-	exeinto /lib/udev
-	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
-	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
-	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/dasd_id/dasd_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"
-	keepdir /lib/udev/state
-
-	# 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-098 50-udev.rules
-	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.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
-
-	# 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
-	# create a extra symlink for udevcontrol
-	ln -s "${D}"/usr/share/man/man8/udevd.8.gz \
-		"${D}"/usr/share/man/man8/udevcontrol.8.gz
-
-	# our udev hooks into the rc system
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-099.sh udev-start.sh
-	doins "${FILESDIR}"/udev-stop.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
-
-}
-
-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
-
-	# 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
-
-	if [ ! -e ${ROOT}/lib/udev/devices/urandom ] ; then
-	    mknod ${ROOT}/lib/udev/devices/urandom c 1 9
-	fi
-	chmod 666 ${ROOT}/lib/udev/devices/urandom
-	touch -t 200010220101 ${ROOT}/lib/udev/devices/urandom
-}
-
-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"
-}
diff --git a/sys-fs/udev/udev-100.ebuild b/sys-fs/udev/udev-100.ebuild
deleted file mode 100644
index b7d987f4542f..000000000000
--- a/sys-fs/udev/udev-100.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# 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-100.ebuild,v 1.3 2007/03/27 20:44:50 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"
-
-# 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}" != "295a9b7bdc8bdb239f8860d14af761b0" ]
-	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
-	exeinto /$(get_libdir)/udev
-	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
-	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
-	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/dasd_id/dasd_id	|| die "Required helper not installed properly"
-	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
-	keepdir /$(get_libdir)/udev/state
-
-	# 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-098 50-udev.rules
-	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules
-	# Use upstream's persistent rules for devices
-	doins etc/udev/rules.d/60-*.rules
-
-	# scsi_id configuration
-	insinto /etc
-	doins extras/scsi_id/scsi_id.config
-
-	# 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
-	# create a extra symlink for udevcontrol
-	ln -s "${D}"/usr/share/man/man8/udevd.8.gz \
-		"${D}"/usr/share/man/man8/udevcontrol.8.gz
-
-	# our udev hooks into the rc system
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-099.sh udev-start.sh
-	doins "${FILESDIR}"/udev-stop.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
-
-}
-
-pkg_preinst() {
-	if [[ -d ${ROOT}/$(get_libdir)/udev-state ]] ; then
-		mv -f "${ROOT}"/$(get_libdir)/udev-state/* "${D}"/$(get_libdir)/udev/state/
-		rm -r "${ROOT}"/$(get_libdir)/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
-
-	# 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
-
-	if [ ! -e ${ROOT}/lib/udev/devices/urandom ] ; then
-	    mknod ${ROOT}/lib/udev/devices/urandom c 1 9
-	fi
-	chmod 666 ${ROOT}/lib/udev/devices/urandom
-	touch -t 200010220101 ${ROOT}/lib/udev/devices/urandom
-}
-
-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"
-}
diff --git a/sys-fs/udev/udev-103.ebuild b/sys-fs/udev/udev-103.ebuild
deleted file mode 100644
index ac0eb2d5f7ed..000000000000
--- a/sys-fs/udev/udev-103.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# 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-103.ebuild,v 1.10 2007/03/27 20:44:50 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"
-
-# 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}" != "295a9b7bdc8bdb239f8860d14af761b0" ]
-	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 \
-				  extras/rule_generator"
-
-	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 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"
-
-	# need to keep this until /sbin/rc stops checking for its presence, it's
-	# really not needed for us to work properly at all.
-	dosbin udev			|| die "Required binary not installed properly"
-
-	# Helpers
-	exeinto /lib/udev
-	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
-	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
-	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/dasd_id/dasd_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"
-	keepdir /lib/udev/state
-
-	# 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-098 50-udev.rules
-	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.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
-
-	# 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
-	# create a extra symlink for udevcontrol
-	ln -s "${D}"/usr/share/man/man8/udevd.8.gz \
-		"${D}"/usr/share/man/man8/udevcontrol.8.gz
-
-	# our udev hooks into the rc system
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-099.sh udev-start.sh
-	doins "${FILESDIR}"/udev-stop.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
-
-}
-
-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
-
-	# 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
-
-	if [ ! -e ${ROOT}/lib/udev/devices/urandom ] ; then
-	    mknod ${ROOT}/lib/udev/devices/urandom c 1 9
-	fi
-	chmod 666 ${ROOT}/lib/udev/devices/urandom
-	touch -t 200010220101 ${ROOT}/lib/udev/devices/urandom
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == "/" ]] ; then
-		if [[ -n $(pidof udevd) ]] ; then
-			killall -15 udevd &>/dev/null
-			sleep 1
-			killall -9 udevd &>/dev/null
-		fi
-		/sbin/udevd --daemon
-	fi
-
-	# 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"
-}
diff --git a/sys-fs/udev/udev-104-r11.ebuild b/sys-fs/udev/udev-104-r11.ebuild
deleted file mode 100644
index 2a0c7376963e..000000000000
--- a/sys-fs/udev/udev-104-r11.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# 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-104-r11.ebuild,v 1.12 2007/03/27 20:44:50 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"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# patches go here...
-	#epatch ${FILESDIR}/${P}-udev_volume_id.patch
-	epatch ${FILESDIR}/${P}-netif-rename-busywait.patch
-	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
-	epatch ${FILESDIR}/${PN}-104-persistent-net-fix-name-dups.patch
-	epatch ${FILESDIR}/${PN}-105-vol_id-fix.patch
-	epatch ${FILESDIR}/${PN}-105-unlink-db-files.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}" != "295a9b7bdc8bdb239f8860d14af761b0" ]
-	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 \
-				  extras/rule_generator"
-
-	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 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 /lib/udev
-	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
-	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
-	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/dasd_id/dasd_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"
-	keepdir /lib/udev/state
-	keepdir /lib/udev/devices
-
-	# 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"
-	newexe ${FILESDIR}/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
-	doexe ${FILESDIR}/modprobe.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-104-r10 50-udev.rules
-	newins ${FILESDIR}/05-udev-early.rules-104-r5 05-udev-early.rules
-	doins ${FILESDIR}/95-net.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
-
-	# set up the /etc/dev.d directory tree
-	keepdir /etc/dev.d
-
-	# 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
-	# 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-104-r10.sh udev-start.sh
-	newins "${FILESDIR}"/udev-stop-104-r8.sh udev-stop.sh
-
-	# Insert udev-version number into udev-rcscript addon
-	sed -e "s/@@UDEV_VERSION@@/${PV}/" \
-		-i "${D}"/$(get_libdir)/rcscripts/addons/udev-start.sh \
-		-i "${D}"/$(get_libdir)/rcscripts/addons/udev-stop.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
-
-}
-
-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
-		if [[ -n $(pidof udevd) ]] ; then
-			killall -15 udevd &>/dev/null
-			sleep 1
-			killall -9 udevd &>/dev/null
-		fi
-		/sbin/udevd --daemon
-	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
-
-	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"
-}