Cleanup depends. Add missing depends for documentation processing of udev-9999. Fix kernel version check of udev-9999. Update rules patch for udev-137, move all rules in one file.

(Portage version: 2.1.6.7/cvs/Linux i686)

4 files changed, 66 insertions, 28 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index c4cfd6e40225..45ef5ec72998 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # 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.444 2009/01/25 19:55:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.445 2009/01/27 10:42:15 zzam Exp $
+
+  27 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+  files/udev-137-rules-update.diff, udev-137.ebuild, udev-9999.ebuild:
+  Cleanup depends. Add missing depends for documentation processing of
+  udev-9999. Fix kernel version check of udev-9999. Update rules patch for
+  udev-137, move all rules in one file.
 
   25 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> udev-137.ebuild:
   Fix kernel version with which udev runs reliable. Also apply documentation
diff --git a/sys-fs/udev/files/udev-137-rules-update.diff b/sys-fs/udev/files/udev-137-rules-update.diff
index 8e1a6d4a0d0b..7013e8f41bca 100644
--- a/sys-fs/udev/files/udev-137-rules-update.diff
+++ b/sys-fs/udev/files/udev-137-rules-update.diff
@@ -2,7 +2,7 @@ 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 @@
+@@ -1,12 +1,25 @@
  # do not edit this file, it will be overwritten on update
  
 -# capi devices
@@ -15,17 +15,30 @@ Index: udev-git/rules/gentoo/40-gentoo.rules
  KERNEL=="loop[0-9]*",	SYMLINK+="loop/%n"
  KERNEL=="ram[0-9]*",	SYMLINK+="rd/%n"
  
-+# keep devices after unload
++# keep devices after driver unload
 +KERNEL=="ppp", OPTIONS+="ignore_remove"
 +KERNEL=="tun", OPTIONS+="ignore_remove"
 +
++
++# setting permissions
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
++
++# dialout devices
++KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp"
++
++# sound devices (oss)
++SUBSYSTEM=="snd",	GROUP="audio"
++
++# Sony Vaio Jogdial sonypi device
++KERNEL=="sonypi",	MODE="0666"
++
 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
- 
++++ /dev/null
+@@ -1,26 +0,0 @@
+-# do not edit this file, it will be overwritten on update
+-
 -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb", MODE="664"
 -
 -# cdrom devices
@@ -39,17 +52,14 @@ Index: udev-git/rules/gentoo/65-permissions.rules
 -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
+-
+-# 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"
+-
+-# 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 c9aebf145821..38a4f8c52a10 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.3 2009/01/25 19:55:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-137.ebuild,v 1.4 2009/01/27 10:42:15 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -19,11 +19,22 @@ 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}
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )"
+
+if [[ ${PV} == "9999" ]]; then
+	# for documentation processing with xsltproc
+	DEPEND="${COMMON_DEPEND}
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd"
+else
+	DEPEND="${COMMON_DEPEND}"
+fi
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/coldplug
+	!<sys-fs/device-mapper-1.02.19-r1
 	>=sys-apps/baselayout-1.12.5"
+
 # We need the lib/rcscripts/addon support
 PROVIDE="virtual/dev-manager"
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 4c48b549b069..d0713539e786 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.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-9999.ebuild,v 1.5 2009/01/22 11:18:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.6 2009/01/27 10:42:15 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -19,11 +19,22 @@ SLOT="0"
 KEYWORDS=""
 IUSE="selinux"
 
-DEPEND="selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-apps/coldplug
-	!<sys-fs/device-mapper-1.02.19-r1"
-RDEPEND="${DEPEND} ${RDEPEND}
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )"
+
+if [[ ${PV} == "9999" ]]; then
+	# for documentation processing with xsltproc
+	DEPEND="${COMMON_DEPEND}
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd"
+else
+	DEPEND="${COMMON_DEPEND}"
+fi
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/coldplug
+	!<sys-fs/device-mapper-1.02.19-r1
 	>=sys-apps/baselayout-1.12.5"
+
 # We need the lib/rcscripts/addon support
 PROVIDE="virtual/dev-manager"
 
@@ -38,7 +49,7 @@ pkg_setup() {
 	local KV_MINOR=$(get_version_component_range 2 ${KV})
 	local KV_MICRO=$(get_version_component_range 3 ${KV})
 
-	local KV_min_micro=15 KV_min_micro_reliable=20
+	local KV_min_micro=15 KV_min_micro_reliable=22
 	KV_min=2.6.${KV_min_micro}
 	KV_min_reliable=2.6.${KV_min_micro_reliable}