Rules update.

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 68 insertions, 7 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e2876b1c675d..916e55597adf 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.442 2009/01/24 21:14:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.443 2009/01/24 22:21:50 zzam Exp $
+
+  24 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-137-rules-update.diff, udev-137.ebuild:
+  Rules update.
 
 *udev-135-r4 (24 Jan 2009)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3406d8f37818..3d25dfc4fa84 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -35,6 +35,7 @@ AUX udev-135-r2.initd 4735 RMD160 81089d57c52ab9a685a647049103ae7f2630e25d SHA1
 AUX udev-135-r3.confd 1060 RMD160 541c9530a0ef5415b6aba6df24c49c82927fd972 SHA1 942f40b4760d6941e83003546ae8da4eb0912ec2 SHA256 01900956829beb4d031e097a8cca26e52ac33e0cb1658d1e8ab8eb7dbbd70bc6
 AUX udev-135-rules-update.diff 491 RMD160 175c31cc04287059b88abe4eff41b548c0780894 SHA1 d3365b058964046f47bfce60d1d18a63832cb9a8 SHA256 f6718f689cb3fe256f859d9280164cb6bfeed9452ffc5447c488f397fb4ea9a7
 AUX udev-136-fix-ide-cd-rule.diff 954 RMD160 249e09db662bd12ae2a98e9632bf684e6a66f177 SHA1 9b586d2f5786533a7a23167dd1d9587087c198e2 SHA256 cd353dbc950f4477cc22b251bee7a441994aa514c2399ef8a3ea94e5fd5992c1
+AUX udev-137-rules-update.diff 2015 RMD160 d6d8c7ec89c53dd9ee75db98e3b7ed4539cd873e SHA1 b8579d67a376363762f9d3c6ab8907f500d59b1d SHA256 f61cfe9f3c6b4a3948ae26b07b10f32047d2da642943a55d905123240c6bdba4
 AUX udev-dev-tarball-135-r2.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60
 AUX udev-fix-udevinfo-in-doc.diff 9455 RMD160 9a8198f50956d71408b92b4eb8e47c96b7ac5cc5 SHA1 981e6e2258466817933716bfa76b42160baa1f3a SHA256 ca5967beeace666d1882397549ecc7735d50a56789f45de6846f33127cbb2f8e
 AUX udev-mount-135-r2.initd 2727 RMD160 cdc0d9a8ebaa1160488cbcf41be7d6c6d380e387 SHA1 87c0e5371a67f228b5b276f5e548c73b5ba3e53c SHA256 f1f794e030f7fc34e0e2de1d986b1354cd61fd51778b87ad8d5665017ef6a5b0
@@ -86,14 +87,14 @@ EBUILD udev-135-r3.ebuild 11230 RMD160 b1bfe5d74055ee6161a8881b38515e535e56519f
 EBUILD udev-135-r4.ebuild 11329 RMD160 13c33377f02a6e50aeb4d15e434afdebabaa7dd8 SHA1 46cf38181ab57bb5abad9c038a74a7263b4e9c06 SHA256 bad4941b9f0913beea70886e66f10234863178e6bccdd8c7c1b851d2c90e6027
 EBUILD udev-135.ebuild 12079 RMD160 88554ff3379d6d74c0537a0848b71e346e5a6108 SHA1 1d2375e4eb0516e4015b534ac4ecb848e8ed5df9 SHA256 8cd73c178e60d06862bbe99f02e86cf0d517edcad6faa5dd0ffe57863355bdb9
 EBUILD udev-136.ebuild 12044 RMD160 6f33dfc2134dd18a46bacf230aa33f7338d1b005 SHA1 bbdeb3f9c0085e35c4c65b1684287bc2356a4ea0 SHA256 892d2e556fa800beab9aa3b151f476067149d339ac769acdcd88e1f07de0134a
-EBUILD udev-137.ebuild 11991 RMD160 8ca6a3adc247c46d717cc94064b94dc389ca1002 SHA1 3a4977282533ea77c2675db6ba3144afcb82afbe SHA256 0babb8c99bb9d2167422f91d67ca01caa9d93002f499e4a0a702cf6faafbd653
+EBUILD udev-137.ebuild 12036 RMD160 34f48cb05ce39cb26896dc56e1d85b2243d98af1 SHA1 52ab2363c2731d5e4fb834fb45912fe47e6eb1a5 SHA256 71c39ed98069cc633c17427acad5ed98407085bfdcea574e225c578f95de02e5
 EBUILD udev-9999.ebuild 11916 RMD160 428a7df9b6dd39f857e9eb917966372f189e3d6e SHA1 da995c94fa556c76b0e31a6c0721cb9b526d3aba SHA256 afa1d232d2690afb86db6c5d62736af711a79b967a7370c09619c7fb89819bac
-MISC ChangeLog 91301 RMD160 26ae5e35c9183aff6346f732c9eda10df94e7cd4 SHA1 165d8846152be82c4d4b5f42f8226c49289ae965 SHA256 0dc0c43efb319d4c67cff220a896bf37e5ffb2a45b63fb7b6b4f64ce09d2e6a3
+MISC ChangeLog 91425 RMD160 9f23964c5580097fe0df4f19d8376b4a95bf69bc SHA1 221c1855050706b78cf8dff514ed18ee423f1a87 SHA256 47a6e6f47e7956a9331a50311731cac7fe2e356808e1c424c9d62ffba703b439
 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkl7hKsACgkQt2vP6XvVdOdnVwCeM7bLNMEevGm+1rfD61rL63bl
-G2YAn1OVfsqhoG7JlH/H0tgHMI+dNE1g
-=Djt+
+iEYEARECAAYFAkl7lIcACgkQt2vP6XvVdOcT/wCeLnPZOvWh1op+MLY6fgZ5SwVI
+qXQAn0rXyHs73rp5vRMo/j1ny1ioVNNp
+=2AIy
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-137-rules-update.diff b/sys-fs/udev/files/udev-137-rules-update.diff
new file mode 100644
index 000000000000..8e1a6d4a0d0b
--- /dev/null
+++ b/sys-fs/udev/files/udev-137-rules-update.diff
@@ -0,0 +1,55 @@
+Index: udev-git/rules/gentoo/40-gentoo.rules
+===================================================================
+--- udev-git.orig/rules/gentoo/40-gentoo.rules
++++ udev-git/rules/gentoo/40-gentoo.rules
+@@ -1,12 +1,12 @@
+ # do not edit this file, it will be overwritten on update
+ 
+-# capi devices
+-KERNEL=="capi",		NAME="capi20", SYMLINK+="isdn/capi20"
+-KERNEL=="capi*",	NAME="capi/%n"
+-
+ # old devfs path, removing this could break systems
+ # Bug 195839
+ KERNEL=="md[0-9]*",	SYMLINK+="md/%n"
+ KERNEL=="loop[0-9]*",	SYMLINK+="loop/%n"
+ KERNEL=="ram[0-9]*",	SYMLINK+="rd/%n"
+ 
++# keep devices after unload
++KERNEL=="ppp", OPTIONS+="ignore_remove"
++KERNEL=="tun", OPTIONS+="ignore_remove"
++
+Index: udev-git/rules/gentoo/65-permissions.rules
+===================================================================
+--- udev-git.orig/rules/gentoo/65-permissions.rules
++++ udev-git/rules/gentoo/65-permissions.rules
+@@ -1,25 +1,12 @@
+ # do not edit this file, it will be overwritten on update
+ 
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb", MODE="664"
+-
+-# cdrom devices
+-ENV{ID_CDROM}=="?*", GROUP="cdrom", MODE="660"
+-KERNEL=="pktcdvd|pktcdvd[0-9]*", GROUP="cdrom", MODE="660"
+-# assign cdrom-permission also to associated generic device (for cd-burning ...)
+-SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[45]", GROUP="cdrom", MODE="660"
+-
+-
+-# tape devices
+-KERNEL=="st[0-9]*|nst[0-9]*|ht[0-9]*|nht[0-9]*|pt[0-9]*|npt[0-9]*", \
+-	GROUP="tape", MODE="660"
+-SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE="660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+ 
+ # dialout devices
+-KERNEL=="ippp*|isdn*|dcbri*|capi*|rfcomm*|ttyACM[0-9]*", GROUP="uucp"
+-KERNEL=="pilot",	GROUP="uucp"
++KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp"
+ 
+-# sound devices (sound=alsa, snd=oss)
+-SUBSYSTEM=="sound|snd",	GROUP="audio"
++# sound devices (oss)
++SUBSYSTEM=="snd",	GROUP="audio"
+ 
+ # Sony Vaio Jogdial sonypi device
+ KERNEL=="sonypi",	MODE="0666"
diff --git a/sys-fs/udev/udev-137.ebuild b/sys-fs/udev/udev-137.ebuild
index b095da511bb7..c6072245039b 100644
--- a/sys-fs/udev/udev-137.ebuild
+++ b/sys-fs/udev/udev-137.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-137.ebuild,v 1.1 2009/01/24 21:01:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-137.ebuild,v 1.2 2009/01/24 22:21:51 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -79,6 +79,7 @@ src_unpack() {
 	cd "${S}"
 
 	# patches go here...
+	epatch "${FILESDIR}/${P}-rules-update.diff"
 
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \