Added isdn and pilot devices to group uucp. Removed older test versions.

Package-Manager: portage-2.1.3.9

10 files changed, 39 insertions, 720 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 5e1352c56d9a..7823afe2ca1d 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.350 2007/09/20 17:17:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.351 2007/09/20 20:28:42 zzam Exp $
+
+*udev-115-r5 (20 Sep 2007)
+
+  20 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
+  files/udev-115-add-special-rule-files.diff, -udev-115-r2.ebuild,
+  -udev-115-r3.ebuild, -udev-115-r4.ebuild, +udev-115-r5.ebuild:
+  Added isdn and pilot devices to group uucp. Removed older test versions.
 
 *udev-115-r4 (20 Sep 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 7d65cbf0e73f..8ff5e0450a1e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -109,10 +109,10 @@ AUX udev-114-root-link-2.diff 4677 RMD160 47b040b51ed0dc637ff2197373db5173bc5985
 MD5 fd97ab764c587e21b8fadaa171e2688f files/udev-114-root-link-2.diff 4677
 RMD160 47b040b51ed0dc637ff2197373db5173bc59854e files/udev-114-root-link-2.diff 4677
 SHA256 d212407420bb46a541e547d59862668745dd8b516b6be6e6619cf967ab2124f9 files/udev-114-root-link-2.diff 4677
-AUX udev-115-add-special-rule-files.diff 2983 RMD160 a6c5e9f37d4f2c97b9f5f86bb9625e35d285ebcd SHA1 0865a7086ed3a2d5aad9027dc73636e32d4af98d SHA256 48d28ae8a7c820a893763194dda3018c4329e2f5fd0d49db0b190488f19195ec
-MD5 bf0c16c4f47cab04461d10390a64239a files/udev-115-add-special-rule-files.diff 2983
-RMD160 a6c5e9f37d4f2c97b9f5f86bb9625e35d285ebcd files/udev-115-add-special-rule-files.diff 2983
-SHA256 48d28ae8a7c820a893763194dda3018c4329e2f5fd0d49db0b190488f19195ec files/udev-115-add-special-rule-files.diff 2983
+AUX udev-115-add-special-rule-files.diff 3077 RMD160 cfbf3c8b016e11ff0f1bda550d15986386d11a78 SHA1 df0b837cd4a6cd1312c429dbf2a7f455c25cd8d3 SHA256 1476955adb280c660737313c381865608fdbd540921b501fa9db83a461e035cb
+MD5 8839c6aa7da6fed0be441298c1ebdcaf files/udev-115-add-special-rule-files.diff 3077
+RMD160 cfbf3c8b016e11ff0f1bda550d15986386d11a78 files/udev-115-add-special-rule-files.diff 3077
+SHA256 1476955adb280c660737313c381865608fdbd540921b501fa9db83a461e035cb files/udev-115-add-special-rule-files.diff 3077
 AUX udev-115-fix-modprobe-calls.diff 983 RMD160 b8ff9c42ee725280ace07f4be3fdcd2edc19c6e0 SHA1 d849382fb76acaeb9eaf8cb52164a3ab241cdef1 SHA256 6a37d51aa8c73f9425084a37dbd3e67f37d8dc7936738b26d2cbf17809f89dce
 MD5 cf3d8ffda2a34b20040d37c6f5b69f90 files/udev-115-fix-modprobe-calls.diff 983
 RMD160 b8ff9c42ee725280ace07f4be3fdcd2edc19c6e0 files/udev-115-fix-modprobe-calls.diff 983
@@ -198,8 +198,7 @@ DIST udev-111.tar.bz2 190020 RMD160 bb3f1c2b1e24092b42507b663eceffe17f8a4a06 SHA
 DIST udev-112.tar.bz2 194203 RMD160 1c50bcefc04ea08eb4df5eb0b2a12de2d8ff0228 SHA1 f55270798370eb7f432c8ec0c83627ae57cc6274 SHA256 823fabbef5add28a454f3ab67cd3bcf06a41f45b976590f2fe7ea84d22b5186e
 DIST udev-113.tar.bz2 195555 RMD160 02175d9714027716b7a97f49e61625979fd0c43c SHA1 55bea7ec61026b2ecc9d2013da0ef4eed76de948 SHA256 38da4049b76b58ddbc6ead6fa84cb241d94cc38ad4ee7aefd99ae2c57a73a2d4
 DIST udev-114.tar.bz2 198912 RMD160 7f4e4af4a14e62a5260a484f54e2298643081301 SHA1 9e9fed1d6b061a53c6c523798fae8baef893a521 SHA256 d844924f2aa36fffaec1d1a30c0cd1e304224d751c619dce226cce632ad77017
-DIST udev-115-update-20070910.diff.bz2 16364 RMD160 c942f4d73406ae651c16b351cd11577a458f3af5 SHA1 89ddc9814881fae93b1f7670da999aba8349897e SHA256 432321885a798dcb51038007ff93ec14d1873ff230a99f7f62c408b3e826b763
-DIST udev-115-update-20070920.diff.bz2 17238 RMD160 4c813651c63899f407c506c5ade1767fd3feb8a1 SHA1 8a36eaa2c613ddd68836ab823faa71a3a5f1c525 SHA256 671f2572ee1e4fd7eff1815d4a204618d34289164df1b7f1e2952a07464adf1b
+DIST udev-115-update-20070920-2.diff.bz2 17578 RMD160 a898aeeb2380f7123bb598a2bc052d74831d1d42 SHA1 da1d03b813a20144850cb6482f96fcb9c3d36578 SHA256 23d21cd1b3b72bbfead6f338bf7d8c7fe1616968c3de7a4755411b6c337bbf53
 DIST udev-115-update-20079804.diff.bz2 16067 RMD160 0b67eda0135bb41108c6b3c9add2ee339aaa4515 SHA1 0878fd3e173d22afff80bc87b74ba23a3b60a490 SHA256 911071b8a5a61b0b9086ad40cf18140c67e9c58ca8be650e10728bb8c9ec4e08
 DIST udev-115.tar.bz2 198893 RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa SHA1 392f5a8d35a231b0edf075827f194ccfd946234f SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93
 EBUILD udev-104-r12.ebuild 9539 RMD160 3ea7426633221cc11168e6f67872318e55b6295e SHA1 6eace4303ec38f8d7d0887925dcaab5b1161fa96 SHA256 0cf0d7a65976ebaaa287ac3eb39b32ff91f553de5af91ad01dc5a170c97bfbe5
@@ -258,26 +257,18 @@ EBUILD udev-115-r1.ebuild 9818 RMD160 8070e7c4f7ea0f7e0fbd83a673012637ebadf118 S
 MD5 535c0dbf4a8d119c82049b8244a4c595 udev-115-r1.ebuild 9818
 RMD160 8070e7c4f7ea0f7e0fbd83a673012637ebadf118 udev-115-r1.ebuild 9818
 SHA256 9819d991f01b5909cc84f3c39524312939d783025e4d06b93972283d5d65810b udev-115-r1.ebuild 9818
-EBUILD udev-115-r2.ebuild 9766 RMD160 e8f69a202b02a955b1a452dd2f7d7b7b3f16ea1c SHA1 3aeba43941b225c0fb9c6a972469e538f068e6c8 SHA256 ca1ccefef687dead39e4cfa0f7e7c1b2510df917da40d0df468f328abdcd6866
-MD5 ba3497d6567516638e8e4ab68b07b63a udev-115-r2.ebuild 9766
-RMD160 e8f69a202b02a955b1a452dd2f7d7b7b3f16ea1c udev-115-r2.ebuild 9766
-SHA256 ca1ccefef687dead39e4cfa0f7e7c1b2510df917da40d0df468f328abdcd6866 udev-115-r2.ebuild 9766
-EBUILD udev-115-r3.ebuild 9741 RMD160 dda936e1e3f9cef931396418c25efa2ca9fb3e78 SHA1 a9a9a7d9686361251846c7e82b80731d372eea91 SHA256 de4e5c06c2a08dd30c0d8811010eaeb5d58c4fadc498e93dc7edd08d45166e7f
-MD5 3bd117470b64bb5bb62f07e337014ce9 udev-115-r3.ebuild 9741
-RMD160 dda936e1e3f9cef931396418c25efa2ca9fb3e78 udev-115-r3.ebuild 9741
-SHA256 de4e5c06c2a08dd30c0d8811010eaeb5d58c4fadc498e93dc7edd08d45166e7f udev-115-r3.ebuild 9741
-EBUILD udev-115-r4.ebuild 9741 RMD160 002e2df060733bc6a0fd13ab4787e49eb2f600eb SHA1 9ceeaceaa662222d0b6676457a465979bc053272 SHA256 47458a1e8de51568610c27125e00fa1d3a1ca8d925d4c34e02d5b54d196bacc0
-MD5 9824d525284db59276a3a2edd18d28b2 udev-115-r4.ebuild 9741
-RMD160 002e2df060733bc6a0fd13ab4787e49eb2f600eb udev-115-r4.ebuild 9741
-SHA256 47458a1e8de51568610c27125e00fa1d3a1ca8d925d4c34e02d5b54d196bacc0 udev-115-r4.ebuild 9741
+EBUILD udev-115-r5.ebuild 9743 RMD160 edfc36fa529b5dbd458ff3f56f492677fd13203a SHA1 6be9254cc398e67339bfeacda8602036b733ccbe SHA256 aa9e43e95a5599d56621c395538e6164a581da68919075fac71f95f43b598c44
+MD5 107401fe57a26396a28446aec1ee110a udev-115-r5.ebuild 9743
+RMD160 edfc36fa529b5dbd458ff3f56f492677fd13203a udev-115-r5.ebuild 9743
+SHA256 aa9e43e95a5599d56621c395538e6164a581da68919075fac71f95f43b598c44 udev-115-r5.ebuild 9743
 EBUILD udev-115.ebuild 9491 RMD160 8b5d98513a52edc00e77b0b347f7771917eb4898 SHA1 4fd9204e3e969b3034128ed708c454bca91b7a94 SHA256 5f503ab29fced876cff8eee825d5c4d366580c594a1fdb3050771eba6d7f8276
 MD5 a223e37d05e117a40242e898ce94d6f7 udev-115.ebuild 9491
 RMD160 8b5d98513a52edc00e77b0b347f7771917eb4898 udev-115.ebuild 9491
 SHA256 5f503ab29fced876cff8eee825d5c4d366580c594a1fdb3050771eba6d7f8276 udev-115.ebuild 9491
-MISC ChangeLog 70685 RMD160 c89fe74ba5cdcea119c857e1ae621c98b0c2bf39 SHA1 4bded9f6a12d53b48486f77668a2bd371510ac90 SHA256 57db5133fcc7a853f20f9e367aaa6c3274d153a6cecbc20cc4c8b13e2ce10c2b
-MD5 c5a1b3d686de2bd8295094587a6a49e5 ChangeLog 70685
-RMD160 c89fe74ba5cdcea119c857e1ae621c98b0c2bf39 ChangeLog 70685
-SHA256 57db5133fcc7a853f20f9e367aaa6c3274d153a6cecbc20cc4c8b13e2ce10c2b ChangeLog 70685
+MISC ChangeLog 70974 RMD160 5c2e80bd09a96b7fe54dad397fbdf1c6e18ef022 SHA1 73027647beaa3c12151c70ec434a74842a6f33a7 SHA256 6dca6ce0ff0720dfcfaa3430ef7ed0bf192c863e63397990dcf14d1efe46904a
+MD5 5ce4f7c143a99f9ce64346accb30a072 ChangeLog 70974
+RMD160 5c2e80bd09a96b7fe54dad397fbdf1c6e18ef022 ChangeLog 70974
+SHA256 6dca6ce0ff0720dfcfaa3430ef7ed0bf192c863e63397990dcf14d1efe46904a ChangeLog 70974
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -327,19 +318,13 @@ SHA256 577c5bf89f320d4cde77951dbd0d32f6cd05c09eb13d153c0dda20cc1a3a135e files/di
 MD5 520716ec2e9cd02d531cadd500f5aac8 files/digest-udev-115-r1 506
 RMD160 887995b194c9b8b108ff9523339a6f5b44cbb7df files/digest-udev-115-r1 506
 SHA256 72db9d525a00b48494c6ad380747ba00f5594b1ac0a05d34e02c0ab5e9868b1d files/digest-udev-115-r1 506
-MD5 3cb8f92c1ecb7da687b05107a3bad096 files/digest-udev-115-r2 506
-RMD160 6514ad2bb1a71a19e33046c62615ad32d749ab58 files/digest-udev-115-r2 506
-SHA256 ff117ca72ad35f13bc955b2d40e29119d8c46530a0eeff1c71e54ae2ece99cc5 files/digest-udev-115-r2 506
-MD5 3cb8f92c1ecb7da687b05107a3bad096 files/digest-udev-115-r3 506
-RMD160 6514ad2bb1a71a19e33046c62615ad32d749ab58 files/digest-udev-115-r3 506
-SHA256 ff117ca72ad35f13bc955b2d40e29119d8c46530a0eeff1c71e54ae2ece99cc5 files/digest-udev-115-r3 506
-MD5 5120bf7aa474e8dbf6d85dac173b7566 files/digest-udev-115-r4 506
-RMD160 b42f1b05b27b05a09b10903cdd0a56233e8ea557 files/digest-udev-115-r4 506
-SHA256 0e00f3fbc22e350421e3de336879809a20ea110852bc5cac42c5b2949a2ca52e files/digest-udev-115-r4 506
+MD5 238be84ff86fa0d23889a67fb2f5095c files/digest-udev-115-r5 512
+RMD160 80f1a54721b55b914dc0b2f2739ca3029b597678 files/digest-udev-115-r5 512
+SHA256 5c21b38a4266814f133c6e5ad1e3b94ccc2b12bde8b000b06d5e3899d9bc054a files/digest-udev-115-r5 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG8qtNt2vP6XvVdOcRAmHOAKDBRRv9Ps7A/Aewp0U3a23Z8RQojQCffLBE
-EVdpy1MN6N0fP4Gq5vpng+s=
-=lWH/
+iD8DBQFG8tgFt2vP6XvVdOcRAsj7AKCTUgBYyWoNWa/9XMoAUv6GaiN/mQCfbiz1
+gkn+4ygRbUyc0kuJEsVPwBQ=
+=cpBF
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-115-r2 b/sys-fs/udev/files/digest-udev-115-r2
deleted file mode 100644
index 6d969106793c..000000000000
--- a/sys-fs/udev/files/digest-udev-115-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e3143b9e4f49a2d99633db5d39253c27 udev-115-update-20070910.diff.bz2 16364
-RMD160 c942f4d73406ae651c16b351cd11577a458f3af5 udev-115-update-20070910.diff.bz2 16364
-SHA256 432321885a798dcb51038007ff93ec14d1873ff230a99f7f62c408b3e826b763 udev-115-update-20070910.diff.bz2 16364
-MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893
-RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893
-SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893
diff --git a/sys-fs/udev/files/digest-udev-115-r3 b/sys-fs/udev/files/digest-udev-115-r3
deleted file mode 100644
index 6d969106793c..000000000000
--- a/sys-fs/udev/files/digest-udev-115-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e3143b9e4f49a2d99633db5d39253c27 udev-115-update-20070910.diff.bz2 16364
-RMD160 c942f4d73406ae651c16b351cd11577a458f3af5 udev-115-update-20070910.diff.bz2 16364
-SHA256 432321885a798dcb51038007ff93ec14d1873ff230a99f7f62c408b3e826b763 udev-115-update-20070910.diff.bz2 16364
-MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893
-RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893
-SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893
diff --git a/sys-fs/udev/files/digest-udev-115-r4 b/sys-fs/udev/files/digest-udev-115-r4
deleted file mode 100644
index 18259fd2435d..000000000000
--- a/sys-fs/udev/files/digest-udev-115-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a5d3c1964e264c720580e0cff9683860 udev-115-update-20070920.diff.bz2 17238
-RMD160 4c813651c63899f407c506c5ade1767fd3feb8a1 udev-115-update-20070920.diff.bz2 17238
-SHA256 671f2572ee1e4fd7eff1815d4a204618d34289164df1b7f1e2952a07464adf1b udev-115-update-20070920.diff.bz2 17238
-MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893
-RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893
-SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893
diff --git a/sys-fs/udev/files/digest-udev-115-r5 b/sys-fs/udev/files/digest-udev-115-r5
new file mode 100644
index 000000000000..7351fa29b38f
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-115-r5
@@ -0,0 +1,6 @@
+MD5 6c86e7dd16452031a2193b5f71e9e3b6 udev-115-update-20070920-2.diff.bz2 17578
+RMD160 a898aeeb2380f7123bb598a2bc052d74831d1d42 udev-115-update-20070920-2.diff.bz2 17578
+SHA256 23d21cd1b3b72bbfead6f338bf7d8c7fe1616968c3de7a4755411b6c337bbf53 udev-115-update-20070920-2.diff.bz2 17578
+MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893
+RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893
+SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893
diff --git a/sys-fs/udev/files/udev-115-add-special-rule-files.diff b/sys-fs/udev/files/udev-115-add-special-rule-files.diff
index bd620dd71d7f..bd63686c9e87 100644
--- a/sys-fs/udev/files/udev-115-add-special-rule-files.diff
+++ b/sys-fs/udev/files/udev-115-add-special-rule-files.diff
@@ -30,7 +30,7 @@ Index: udev-git/etc/udev/gentoo/65-permissions.rules
 ===================================================================
 --- /dev/null
 +++ udev-git/etc/udev/gentoo/65-permissions.rules
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,20 @@
 +# do not edit this file, it will be overwritten on update
 +
 +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb", MODE="664"
@@ -47,6 +47,9 @@ Index: udev-git/etc/udev/gentoo/65-permissions.rules
 +	GROUP="tape", MODE="660"
 +SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE="660"
 +
++# dialout devices
++KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp"
++KERNEL=="pilot",	GROUP="uucp"
 +
 Index: udev-git/etc/udev/gentoo/40-video.rules
 ===================================================================
diff --git a/sys-fs/udev/udev-115-r2.ebuild b/sys-fs/udev/udev-115-r2.ebuild
deleted file mode 100644
index eff64242422f..000000000000
--- a/sys-fs/udev/udev-115-r2.ebuild
+++ /dev/null
@@ -1,332 +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-115-r2.ebuild,v 1.4 2007/09/10 18:34:10 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-PATCH="${P}-update-20070910.diff"
-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
-	mirror://gentoo/${PATCH}.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${PATCH}.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
-	!<sys-fs/device-mapper-1.02.19-r1"
-RDEPEND="${DEPEND} ${RDEPEND}
-	>=sys-apps/baselayout-1.12.5"
-# We need the lib/rcscripts/addon support
-PROVIDE="virtual/dev-manager"
-
-pkg_setup() {
-	udev_helper_dir="/$(get_libdir)/udev"
-
-	myconf=
-	extras="extras/ata_id \
-			extras/cdrom_id \
-			extras/edd_id \
-			extras/firmware \
-			extras/floppy \
-			extras/path_id \
-			extras/scsi_id \
-			extras/usb_id \
-			extras/volume_id \
-			extras/collect \
-			extras/rule_generator \
-			extras/root_link"
-
-	use selinux && myconf="${myconf} USE_SELINUX=true"
-
-	# comparing kernel version without linux-info.eclass to not pull
-	# virtual/linux-sources
-
-	local KV=$(uname -r)
-	local KV_MAJOR=$(get_major_version ${KV})
-	local KV_MINOR=$(get_version_component_range 2 ${KV})
-	local KV_MICRO=$(get_version_component_range 3 ${KV})
-
-	local ok=0
-	if [[ "${KV_MAJOR}" == 2 ]] && [[ "${KV_MINOR}" == 6 ]] && [[ "${KV_MICRO}" -ge 15 ]]; then
-		ok=1
-	fi
-
-	if [[ "$ok" = "0" ]]; then
-		ewarn
-		ewarn "${P} does not support Linux kernel before version 2.6.15!"
-		ewarn "If you want to use udev you need to update"
-		ewarn "to kernel >=2.6.15!"
-		ewarn
-		ebeep
-	fi
-}
-
-sed_helper_dir() {
-	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# patches go here...
-	epatch "${WORKDIR}/${PATCH}"
-	EPATCH_OPTS="-p1" epatch "${FILESDIR}/udev-115-add-special-rule-files.diff"
-	EPATCH_OPTS="-p1" epatch "${FILESDIR}/${PN}-114-root-link-2.diff"
-
-	# no longer needed
-	rm etc/udev/gentoo/50-udev.rules
-
-	# 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
-	# Do not require xmlto to refresh manpages
-	sed -ie 's|$(MAN_PAGES)||g' Makefile
-
-	# Make sure there is no sudden changes to upstream rules file
-	# (more for my own needs than anything else ...)
-	MD5=`md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules"`
-	MD5=${MD5/  -/}
-	if [ "${MD5}" != "644e3c77eb866dee4ff8dda2e95cd187" ]
-	then
-		echo
-		eerror "50-udev-default.rules has been updated, please validate!"
-		die "50-udev-default.rules has been updated, please validate!"
-	fi
-
-	sed_helper_dir \
-		etc/udev/rules.d/50-udev-default.rules \
-		extras/rule_generator/write_*_rules \
-		udev_rules_parse.c \
-		udev_rules.c
-
-	# Use correct multilib dir
-	sed -i extras/volume_id/lib/Makefile \
-		-e "/ =/s-/lib-/$(get_libdir)-"
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-
-	# Not everyone has full $CHOST-{ld,ar,etc...} yet
-	local mycross=""
-	type -p ${CHOST}-ar && mycross=${CHOST}-
-
-	emake \
-		EXTRAS="${extras}" \
-		libudevdir=${udev_helper_dir} \
-		CROSS_COMPILE=${mycross} \
-		OPTFLAGS="" \
-		${myconf} || die
-}
-
-src_install() {
-	into /
-	emake \
-		DESTDIR="${D}" \
-		libudevdir=${udev_helper_dir} \
-		EXTRAS="${extras}" \
-		${myconf} \
-		install || die
-
-	# make install does not install this
-	dosbin udevstart	|| die "Required binary not installed properly"
-	doman udevstart.8
-
-	exeinto "${udev_helper_dir}"
-	newexe "${FILESDIR}"/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
-	newexe "${FILESDIR}"/modprobe-115.sh modprobe.sh	|| die "Required binary not installed properly"
-	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
-		|| die "Required binary not installed properly"
-
-	keepdir "${udev_helper_dir}"/state
-	keepdir "${udev_helper_dir}"/devices
-
-	# create symlinks for these utilities to /sbin
-	# where multipath-tools expect them to be (Bug #168588)
-	dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id
-	dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id
-
-	# vol_id library (needed by mount and HAL)
-	into /
-	rm "${D}/$(get_libdir)"/libvolume_id.so* 2>/dev/null
-	dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so"
-	into /usr
-	dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a"
-
-	# handle static linking bug #4411
-	rm -f "${D}/usr/$(get_libdir)/libvolume_id.so"
-	gen_usr_ldscript libvolume_id.so
-
-	# Add gentoo stuff to udev.conf
-	cat "${FILESDIR}"/udev.conf.post_114 >> "${D}"/etc/udev/udev.conf
-
-	# Now installing rules
-	cd etc/udev
-	insinto /etc/udev/rules.d/
-
-	# Our rules files
-	doins gentoo/??-*.rules
-
-	# Adding arch specific rules
-	if [[ -f "packages/40-${ARCH}.rules" ]]; then
-		doins "packages/40-${ARCH}.rules"
-	fi
-	cd "${S}"
-
-	# our udev hooks into the rc system
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-114-r1.sh udev-start.sh
-	newins "${FILESDIR}"/udev-stop-111-r2.sh udev-stop.sh
-
-	# The udev-post init-script
-	newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount
-
-	insinto /etc/modprobe.d
-	newins ${FILESDIR}/blacklist-110 blacklist
-	doins ${FILESDIR}/pnp-aliases
-
-	# use our modprobe-wrapper
-	sed	-e '/while read id/s#/sbin/modprobe#/lib/udev/modprobe.sh#' \
-		-e 's#/sbin/modprobe#modprobe.sh#' \
-		-i "${D}"/etc/udev/rules.d/80-drivers.rules
-
-	# convert /lib/udev to real used dir
-	sed_helper_dir \
-		"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
-		"${D}"/etc/init.d/udev* \
-		"${D}"/etc/modprobe.d/*
-
-	# documentation
-	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
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev
-	doenvd 20udev
-}
-
-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() {
-	# 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 2>/dev/null
-	fi
-
-	if has_version "<sys-fs/udev-106-r5"; then
-		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
-			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
-		fi
-	fi
-
-	# Try to remove /etc/dev.d as that is obsolete
-	if [[ -d "${ROOT}"/etc/dev.d ]]; then
-		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null
-		if [[ -d "${ROOT}"/etc/dev.d ]]; then
-			ewarn "You still have the directory /etc/dev.d on your system."
-			ewarn "This is no longer used by udev and can be removed."
-		fi
-	fi
-
-	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
-	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
-		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
-		! has_version sys-fs/device-mapper
-	then
-			rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
-			einfo "Removed unneeded file 64-device-mapper.rules"
-	fi
-
-	if [[ "${ROOT}" == "/" ]] ; then
-		# check if root of init-process is identical to ours
-		if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
-			einfo "restarting udevd now."
-			if [[ -n $(pidof udevd) ]] ; then
-				killall -15 udevd &>/dev/null
-				sleep 1
-				killall -9 udevd &>/dev/null
-			fi
-			/sbin/udevd --daemon
-		fi
-	fi
-
-	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-115-r4.ebuild b/sys-fs/udev/udev-115-r4.ebuild
deleted file mode 100644
index be9184e7d609..000000000000
--- a/sys-fs/udev/udev-115-r4.ebuild
+++ /dev/null
@@ -1,332 +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-115-r4.ebuild,v 1.1 2007/09/20 17:17:57 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-PATCH="${P}-update-20070920.diff"
-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
-	mirror://gentoo/${PATCH}.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${PATCH}.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
-	!<sys-fs/device-mapper-1.02.19-r1"
-RDEPEND="${DEPEND} ${RDEPEND}
-	>=sys-apps/baselayout-1.12.5"
-# We need the lib/rcscripts/addon support
-PROVIDE="virtual/dev-manager"
-
-pkg_setup() {
-	udev_helper_dir="/$(get_libdir)/udev"
-
-	myconf=
-	extras="extras/ata_id \
-			extras/cdrom_id \
-			extras/edd_id \
-			extras/firmware \
-			extras/floppy \
-			extras/path_id \
-			extras/scsi_id \
-			extras/usb_id \
-			extras/volume_id \
-			extras/collect \
-			extras/rule_generator \
-			extras/root_link"
-
-	use selinux && myconf="${myconf} USE_SELINUX=true"
-
-	# comparing kernel version without linux-info.eclass to not pull
-	# virtual/linux-sources
-
-	local KV=$(uname -r)
-	local KV_MAJOR=$(get_major_version ${KV})
-	local KV_MINOR=$(get_version_component_range 2 ${KV})
-	local KV_MICRO=$(get_version_component_range 3 ${KV})
-
-	local ok=0
-	if [[ "${KV_MAJOR}" == 2 ]] && [[ "${KV_MINOR}" == 6 ]] && [[ "${KV_MICRO}" -ge 15 ]]; then
-		ok=1
-	fi
-
-	if [[ "$ok" = "0" ]]; then
-		ewarn
-		ewarn "${P} does not support Linux kernel before version 2.6.15!"
-		ewarn "If you want to use udev you need to update"
-		ewarn "to kernel >=2.6.15!"
-		ewarn
-		ebeep
-	fi
-}
-
-sed_helper_dir() {
-	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# patches go here...
-	epatch "${WORKDIR}/${PATCH}"
-	EPATCH_OPTS="-p1" epatch "${FILESDIR}/udev-115-add-special-rule-files.diff"
-	epatch "${FILESDIR}/${P}-fix-modprobe-calls.diff"
-	EPATCH_OPTS="-p1" epatch "${FILESDIR}/${PN}-114-root-link-2.diff"
-
-	# add blacklisting option where needed
-	#sed	-e '/MODALIAS/s#modprobe#modprobe --use-blacklist#' \
-	#	-e '/while read id/s#modprobe#modprobe --use-blacklist#' \
-	#	-i etc/udev/rules.d/80-drivers.rules
-
-	# no longer needed
-	rm etc/udev/gentoo/50-udev.rules
-
-	# 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
-	# Do not require xmlto to refresh manpages
-	sed -ie 's|$(MAN_PAGES)||g' Makefile
-
-	# Make sure there is no sudden changes to upstream rules file
-	# (more for my own needs than anything else ...)
-	MD5=`md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules"`
-	MD5=${MD5/  -/}
-	if [ "${MD5}" != "644e3c77eb866dee4ff8dda2e95cd187" ]
-	then
-		echo
-		eerror "50-udev-default.rules has been updated, please validate!"
-		die "50-udev-default.rules has been updated, please validate!"
-	fi
-
-	sed_helper_dir \
-		etc/udev/rules.d/50-udev-default.rules \
-		extras/rule_generator/write_*_rules \
-		udev_rules_parse.c \
-		udev_rules.c
-
-	# Use correct multilib dir
-	sed -i extras/volume_id/lib/Makefile \
-		-e "/ =/s-/lib-/$(get_libdir)-"
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-
-	# Not everyone has full $CHOST-{ld,ar,etc...} yet
-	local mycross=""
-	type -p ${CHOST}-ar && mycross=${CHOST}-
-
-	emake \
-		EXTRAS="${extras}" \
-		libudevdir=${udev_helper_dir} \
-		CROSS_COMPILE=${mycross} \
-		OPTFLAGS="" \
-		${myconf} || die
-}
-
-src_install() {
-	into /
-	emake \
-		DESTDIR="${D}" \
-		libudevdir=${udev_helper_dir} \
-		EXTRAS="${extras}" \
-		${myconf} \
-		install || die
-
-	# make install does not install this
-	dosbin udevstart	|| die "Required binary not installed properly"
-	doman udevstart.8
-
-	exeinto "${udev_helper_dir}"
-	newexe "${FILESDIR}"/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
-	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
-		|| die "Required binary not installed properly"
-
-	keepdir "${udev_helper_dir}"/state
-	keepdir "${udev_helper_dir}"/devices
-
-	# create symlinks for these utilities to /sbin
-	# where multipath-tools expect them to be (Bug #168588)
-	dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id
-	dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id
-
-	# vol_id library (needed by mount and HAL)
-	into /
-	rm "${D}/$(get_libdir)"/libvolume_id.so* 2>/dev/null
-	dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so"
-	into /usr
-	dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a"
-
-	# handle static linking bug #4411
-	rm -f "${D}/usr/$(get_libdir)/libvolume_id.so"
-	gen_usr_ldscript libvolume_id.so
-
-	# Add gentoo stuff to udev.conf
-	cat "${FILESDIR}"/udev.conf.post_115 >> "${D}"/etc/udev/udev.conf
-
-	# Now installing rules
-	cd etc/udev
-	insinto /etc/udev/rules.d/
-
-	# Our rules files
-	doins gentoo/??-*.rules
-
-	# Adding arch specific rules
-	if [[ -f "packages/40-${ARCH}.rules" ]]; then
-		doins "packages/40-${ARCH}.rules"
-	fi
-	cd "${S}"
-
-	# our udev hooks into the rc system
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-115-r3.sh udev-start.sh
-	newins "${FILESDIR}"/udev-stop-111-r2.sh udev-stop.sh
-
-	# The udev-post init-script
-	newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount
-
-	insinto /etc/modprobe.d
-	newins ${FILESDIR}/blacklist-110 blacklist
-	doins ${FILESDIR}/pnp-aliases
-
-	# convert /lib/udev to real used dir
-	sed_helper_dir \
-		"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
-		"${D}"/etc/init.d/udev* \
-		"${D}"/etc/modprobe.d/*
-
-	# documentation
-	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
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev
-	doenvd 20udev
-}
-
-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() {
-	# 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 2>/dev/null
-	fi
-
-	if has_version "<sys-fs/udev-106-r5"; then
-		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
-			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
-		fi
-	fi
-
-	# Try to remove /etc/dev.d as that is obsolete
-	if [[ -d "${ROOT}"/etc/dev.d ]]; then
-		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null
-		if [[ -d "${ROOT}"/etc/dev.d ]]; then
-			ewarn "You still have the directory /etc/dev.d on your system."
-			ewarn "This is no longer used by udev and can be removed."
-		fi
-	fi
-
-	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
-	# remove it if user don't has sys-fs/device-mapper installed
-	if has_version "<sys-fs/udev-113" &&
-		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
-		! has_version sys-fs/device-mapper
-	then
-			rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
-			einfo "Removed unneeded file 64-device-mapper.rules"
-	fi
-
-	if [[ "${ROOT}" == "/" ]] ; then
-		# check if root of init-process is identical to ours
-		if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
-			einfo "restarting udevd now."
-			if [[ -n $(pidof udevd) ]] ; then
-				killall -15 udevd &>/dev/null
-				sleep 1
-				killall -9 udevd &>/dev/null
-			fi
-			/sbin/udevd --daemon
-		fi
-	fi
-
-	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-115-r3.ebuild b/sys-fs/udev/udev-115-r5.ebuild
index 6ae4bd8820bf..0e68c8df8480 100644
--- a/sys-fs/udev/udev-115-r3.ebuild
+++ b/sys-fs/udev/udev-115-r5.ebuild
@@ -1,10 +1,10 @@
 # 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-115-r3.ebuild,v 1.1 2007/09/11 21:50:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r5.ebuild,v 1.1 2007/09/20 20:28:42 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
-PATCH="${P}-update-20070910.diff"
+PATCH="${P}-update-20070920-2.diff"
 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