Version bumped. This is a bugfix release. Now block devices are watched via inotify and trigger persistent storage links to be updated after write access. Removed older versions.

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

6 files changed, 26 insertions, 524 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 7b78055f7227..20b85c4fc986 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,15 @@
 # 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.447 2009/02/13 18:18:21 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.448 2009/02/19 08:41:34 zzam Exp $
+
+*udev-138 (19 Feb 2009)
+
+  19 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
+  -files/udev-136-fix-ide-cd-rule.diff, -files/udev-137-rules-update.diff,
+  -udev-136.ebuild, -udev-137.ebuild, +udev-138.ebuild:
+  Version bumped. This is a bugfix release. Now block devices are watched
+  via inotify and trigger persistent storage links to be updated after write
+  access. Removed older versions.
 
   13 Feb 2009; Tobias Klausmann <klausman@gentoo.org> udev-135-r4.ebuild:
   Stable on alpha, bug #254616
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index df8d7f5c2463..a7b69f099061 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 136/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b
 AUX 136/shell-compat-addon.sh 930 RMD160 c96a77a2085698e4ca3636994d1b6d07326e4b5f SHA1 d696a1ff942d31b493d385cff27bc9cbacd3fa47 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9
 AUX 136/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60
@@ -31,8 +34,6 @@ AUX udev-135-r2.confd 555 RMD160 dd2f1be71fb1ec9021d03f9065ac768de361bf15 SHA1 b
 AUX udev-135-r2.initd 4735 RMD160 81089d57c52ab9a685a647049103ae7f2630e25d SHA1 f46e1d017bbc16dd4f610f31a487b3154eb55a38 SHA256 a8a229d1cbfb9a01b0b08b2c312eed87de2dd996faf3af9476ee6456355505d6
 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 2108 RMD160 3a2bfab3c7f42a57d4facc9a1a6e2bade36134b5 SHA1 a602b2efb069ddc53d46f428ef2232455f110b30 SHA256 3e302f18b177d5841a62d9631df8d568041e752b41b4567a6b76d3b0c02bf097
 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
@@ -68,8 +69,7 @@ DIST udev-125.tar.bz2 205296 RMD160 c1571c3824860a166c830d47784f72630129825e SHA
 DIST udev-130.tar.bz2 442846 RMD160 6b941866b224396792a34db9aa2da0d44dace509 SHA1 da55d4064bd89d4cc3672a3ec304d82a12f0e39c SHA256 bbb64eb268ebc3d7c3bad74774daa2ed0ef887956ae6fb8f6f80717a7c957478
 DIST udev-133.tar.bz2 445588 RMD160 c1f2cdbcd168c6d44bb9ff673e2d73e52bde3aa7 SHA1 c0fe38d1552e3710df5418f7811f0a4c0e405e5a SHA256 fe4785fe93e27be05ded15414e3f590b0cbc309400f9cc461a27d20c042f62a8
 DIST udev-135.tar.bz2 446675 RMD160 c56d146e0d56e140f7c6dd9294673259d27b162c SHA1 dd3c439279312c6f9594800ca73e84f367d2903a SHA256 acbb5e7d322253ed242f28fbc1974bd34a4da7c29275e17cd5b32b38b2a5c849
-DIST udev-136.tar.bz2 447854 RMD160 eaffd816fb37c1c6f275264f51d00375279ffb2d SHA1 3ca4027db7be5415401905de92e5e367abb60fbb SHA256 ff1f113b460c269b747e747bb0da6ce81c2d5fa748051e8f295de8c9242cde43
-DIST udev-137.tar.bz2 448331 RMD160 860f2c0acab09b79e2473c29a4b5df09e7e799f3 SHA1 5d15911b8bcb0f119b3b633cc2955d9ab6dbd9a7 SHA256 1aaa46da688f54f6d3b6ab727d82d011898b473952b74e812e174dd477602ebc
+DIST udev-138.tar.bz2 448611 RMD160 5be1fed7f4ec2ca6953536f9ada982e36db3ca64 SHA1 8b96b5d80782f4f636a13fb1cba7efd7c4c37fc0 SHA256 bc525a4d6bdbace1b23433256643cc331e4049e1e2442333707e6d2ba8a173b4
 EBUILD udev-114.ebuild 9031 RMD160 1b7e45d1a384c52a336727a17e6fbd087855fb34 SHA1 207b330f01cb9970eee14b4c39b7bf2d5b9ce181 SHA256 f45fda83e1308079b9d932586b07acf2d7bf65527f8b414c8d43738fd0c129e5
 EBUILD udev-115-r1.ebuild 10108 RMD160 86ec04530480872e2ac1fbb2fa37fa2819639752 SHA1 1021b13461ac7625f97a60634982416c2a8dddc4 SHA256 765135b405bd90ee6c527c0be00e87c12400121e30261de9ba6d3e4a3c50f872
 EBUILD udev-119.ebuild 10145 RMD160 7b978b270ce5d39443310b7da58aa5ff4bdd02f9 SHA1 fdd10d47bb62517d78f0e7d811903203b4cc3d8e SHA256 2998cfa7681f16132aaad0a8a033e83418c4e418430cabf5ebf1d8631fcc58bd
@@ -83,8 +83,14 @@ EBUILD udev-135-r2.ebuild 11230 RMD160 942d3ef0703e37ca76778f380c9f04d8779d4949
 EBUILD udev-135-r3.ebuild 11230 RMD160 b1bfe5d74055ee6161a8881b38515e535e56519f SHA1 c61f9f3402b79f3a9b4a1807ee184b390a5d8e3a SHA256 41e807d1ac42d9d386d1560d9e0dc3970e15376628b1e225ee3380c6b99f3eca
 EBUILD udev-135-r4.ebuild 11331 RMD160 e7e9cb82b09bcd1c9e590182973eaffe4da8e5a4 SHA1 979ba86905ea8d093875272c137b07c885e1f5e7 SHA256 d6602d059a5cd6939b2d5ecee8a4c83343872a7f02ba5b971bf9a46f5007e614
 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 12287 RMD160 de72b6a24b8cb134fd3384c0748683a954ac6fc1 SHA1 3744b6352ad5f45b82d0018d057b46be65fa83e0 SHA256 7c501abdfabe3834eec1bc3c310b962b8379ad7c30ffafdddb3dc5be42427de7
+EBUILD udev-138.ebuild 12247 RMD160 6f419cdc60571ed69b9832101d9dd38b067e15a1 SHA1 0374fc0a03163255f7bf347c47212327815d196b SHA256 cd34e393b78ff4003d5c1691f82bc4731d474682c9f6930fe2445be995b504f0
 EBUILD udev-9999.ebuild 12114 RMD160 52b7f751a55e51e66792422961b97385f35b8493 SHA1 90d823370d8207cca8c8d95e9ec70399f5f55d73 SHA256 091c4ebc9904ed2924ecce928fc739abc2375835f8b763502a5f6ed82af18828
-MISC ChangeLog 92129 RMD160 e19dfc3a2ec3f09bddfaeab01f18bff80d7b9d59 SHA1 8bf6711bb08992f761bc08220747bdbebf4520a1 SHA256 478e1ae9a860019c32c0789775eebcc2caf82dabc5c3bd20a22a1bffbf2030ee
+MISC ChangeLog 92520 RMD160 7df741d3728b3bed136e96d4c14e07d7fa1aced1 SHA1 35936e981ed641f31d0f887ebb9523a88bb73b20 SHA256 be59086c958e6268ec368776cb9433307c4753538c5c536911c0e47ddfa7195a
 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmdG0QACgkQt2vP6XvVdOe+XwCgwOKGzddwLx9HudyO8gA0whye
+om0Ani1RyguxN/oE9y+XWsPgkEZZMwRW
+=4PhT
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-136-fix-ide-cd-rule.diff b/sys-fs/udev/files/udev-136-fix-ide-cd-rule.diff
deleted file mode 100644
index 1ceaa44cd030..000000000000
--- a/sys-fs/udev/files/udev-136-fix-ide-cd-rule.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 18cff5c3b2e3591fa46107288ea2d7026a15ccf3
-Author: Kay Sievers <kay.sievers@vrfy.org>
-Date:   Sat Jan 10 17:44:09 2009 +0100
-
-    rules: fix typo in ide cd rule
-    
-    Thanks to Scott, who found that.
-
-diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
-index 119941b..7730f0d 100644
---- a/rules/rules.d/50-udev-default.rules
-+++ b/rules/rules.d/50-udev-default.rules
-@@ -68,7 +68,7 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitio
- 
- # cdrom
- SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
--SUBSYSTEM=="block", KERNEL=="hd[0-9]*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
-+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
- SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
- KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
- KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"
diff --git a/sys-fs/udev/files/udev-137-rules-update.diff b/sys-fs/udev/files/udev-137-rules-update.diff
deleted file mode 100644
index 7013e8f41bca..000000000000
--- a/sys-fs/udev/files/udev-137-rules-update.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-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,25 @@
- # 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 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
-+++ /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
--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"
--
--# dialout devices
--KERNEL=="ippp*|isdn*|dcbri*|capi*|rfcomm*|ttyACM[0-9]*", GROUP="uucp"
--KERNEL=="pilot",	GROUP="uucp"
--
--# sound devices (sound=alsa, snd=oss)
--SUBSYSTEM=="sound|snd",	GROUP="audio"
--
--# Sony Vaio Jogdial sonypi device
--KERNEL=="sonypi",	MODE="0666"
--
diff --git a/sys-fs/udev/udev-136.ebuild b/sys-fs/udev/udev-136.ebuild
deleted file mode 100644
index 4d8e805a6d1d..000000000000
--- a/sys-fs/udev/udev-136.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# 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-136.ebuild,v 1.2 2009/01/20 22:45:08 mr_bones_ Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
-	EGIT_BRANCH="master"
-	inherit git autotools
-else
-	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
-fi
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-
-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"
-
-	# 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 KV_min_micro=15 KV_min_micro_reliable=20
-	KV_min=2.6.${KV_min_micro}
-	KV_min_reliable=2.6.${KV_min_micro_reliable}
-
-	local ok=0
-	if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]]
-	then
-		if [[ ${KV_MICRO} -ge ${KV_min_micro_reliable} ]]; then
-			ok=2
-		elif [[ ${KV_MICRO} -ge ${KV_min_micro} ]]; then
-			ok=1
-		fi
-	fi
-
-	if [[ ${ok} -lt 1 ]]
-	then
-		ewarn
-		ewarn "${P} does not support Linux kernel before version ${KV_min}!"
-	fi
-	if [[ ${ok} -lt 2 ]]; then
-		ewarn "If you want to use udev reliable you should update"
-		ewarn "to at least kernel version ${KV_min_reliable}!"
-		ewarn
-		ebeep
-	fi
-}
-
-sed_helper_dir() {
-	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-	else
-		unpack ${A}
-	fi
-
-	cd "${S}"
-
-	# patches go here...
-	epatch "${FILESDIR}/${P}-fix-ide-cd-rule.diff"
-
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/{rules.d,packages}/*.rules
-
-	if [[ ${PV} != 9999 ]]; then
-		# Make sure there is no sudden changes to upstream rules file
-		# (more for my own needs than anything else ...)
-		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
-		MD5=${MD5/  -/}
-		if [[ ${MD5} != 7c7de0a29a2cf218dc43dd099cd3bfec ]]
-		then
-			echo
-			eerror "50-udev-default.rules has been updated, please validate!"
-			eerror "md5sum=${MD5}"
-			die "50-udev-default.rules has been updated, please validate!"
-		fi
-	fi
-
-	sed_helper_dir \
-		rules/rules.d/50-udev-default.rules \
-		extras/rule_generator/write_*_rules \
-		udev/udev-util.c \
-		udev/udev-rules.c \
-		udev/udevd.c || die "sed failed"
-
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-
-	econf \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--exec-prefix= \
-		--with-libdir-name=$(get_libdir) \
-		--enable-logging \
-		$(use_with selinux)
-
-	emake || die "compiling udev failed"
-}
-
-src_install() {
-	local scriptdir="${FILESDIR}/136"
-
-	into /
-	emake DESTDIR="${D}" install || die "make install failed"
-	if [[ "$(get_libdir)" != "lib" ]]; then
-		# we can not just rename /lib to /lib64, because
-		# make install creates /lib64 and /lib
-		mkdir -p "${D}/$(get_libdir)"
-		mv "${D}"/lib/* "${D}/$(get_libdir)/"
-		rmdir "${D}"/lib
-	fi
-
-	exeinto "${udev_helper_dir}"
-	newexe "${FILESDIR}"/net-130-r1.sh net.sh	|| die "net.sh not installed properly"
-	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
-		|| die "move_tmp_persistent_rules.sh not installed properly"
-	newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \
-		|| die "write_root_link_rule not installed properly"
-
-	doexe "${scriptdir}"/shell-compat-KV.sh \
-		|| die "shell-compat.sh not installed properly"
-	doexe "${scriptdir}"/shell-compat-addon.sh \
-		|| die "shell-compat.sh 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
-
-	# Add gentoo stuff to udev.conf
-	echo "# If you need to change mount-options, do it in /etc/fstab" \
-	>> "${D}"/etc/udev/udev.conf
-
-	# let the dir exist at least
-	keepdir /etc/udev/rules.d
-
-	# Now installing rules
-	cd "${S}"/rules
-	insinto "${udev_helper_dir}"/rules.d/
-
-	# Our rules files
-	doins gentoo/??-*.rules
-	doins packages/40-alsa.rules
-	doins packages/40-isdn.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
-	doins "${scriptdir}"/udev-start.sh \
-		|| die "udev-start.sh not installed properly"
-	doins "${scriptdir}"/udev-stop.sh \
-		|| die "udev-stop.sh not installed properly"
-
-	local init
-	# udev-postmount and init-scripts for >=openrc-0.3.1, Bug #240984
-	for init in udev udev-mount udev-dev-tarball udev-postmount; do
-		newinitd "${scriptdir}/${init}.initd" "${init}" \
-			|| die "initscript ${init} not installed properly"
-	done
-
-	# insert minimum kernel versions
-	sed -e "s/%KV_MIN%/${KV_min}/" \
-		-e "s/%KV_MIN_RELIABLE%/${KV_min_reliable}/" \
-		-i "${D}"/etc/init.d/udev-mount
-
-	# config file for init-script and start-addon
-	newconfd "${scriptdir}/udev.confd" udev \
-		|| die "config file not installed properly"
-
-	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 README TODO || die "failed installing docs"
-
-	cd docs/writing_udev_rules
-	mv index.html writing_udev_rules.html
-	dohtml *.html
-
-	cd "${S}"
-
-	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 &&
-	     ! -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
-
-	has_version "=${CATEGORY}/${PN}-103-r3"
-	previous_equal_to_103_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-104-r5"
-	previous_less_than_104_r5=$?
-
-	has_version "<${CATEGORY}/${PN}-106-r5"
-	previous_less_than_106_r5=$?
-
-	has_version "<${CATEGORY}/${PN}-113"
-	previous_less_than_113=$?
-}
-
-fix_old_persistent_net_rules() {
-	local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules
-	[[ -f ${rules} ]] || return
-
-	elog
-	elog "Updating persistent-net rules file"
-
-	# Change ATTRS to ATTR matches, Bug #246927
-	sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
-
-	# Add KERNEL matches if missing, Bug #246849
-	sed -ri \
-		-e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
-		"${rules}"
-}
-
-# See Bug #129204 for a discussion about restarting udevd
-restart_udevd() {
-	# need to merge to our system
-	[[ ${ROOT} = / ]] || return
-
-	# check if root of init-process is identical to ours (not in chroot)
-	[[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
-
-	# abort if there is no udevd running
-	[[ -n $(pidof udevd) ]] || return
-
-	# abort if no /dev/.udev exists
-	[[ -e /dev/.udev ]] || return
-
-	elog
-	elog "restarting udevd now."
-
-	killall -15 udevd &>/dev/null
-	sleep 1
-	killall -9 udevd &>/dev/null
-
-	/sbin/udevd --daemon
-}
-
-pkg_postinst() {
-	fix_old_persistent_net_rules
-
-	restart_udevd
-
-	if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
-	then
-		ewarn
-		ewarn "You need to add the udev init script to the runlevel sysinit,"
-		ewarn "else your system will not be able to boot"
-		ewarn "after updating to >=openrc-0.4.0"
-		ewarn "Run this to enable udev for >=openrc-0.4.0:"
-		ewarn "\trc-update add udev sysinit"
-		ewarn
-	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 [[ $previous_equal_to_103_r3 = 0 ]] &&
-		[[ -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
-
-	# 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 [[ $previous_less_than_104_r5 = 0 ]]
-	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 [[ $previous_less_than_106_r5 = 0 ]] &&
-		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
-	then
-		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
-	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 [[ $previous_less_than_113 = 0 ]] &&
-		[[ -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
-
-	# requested in Bug #225033:
-	elog
-	elog "persistent-net does assigning fixed names to network devices."
-	elog "If you have problems with the persistent-net rules,"
-	elog "just delete the rules file"
-	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
-	elog "and then reboot."
-	elog
-	elog "This may however number your devices in a different way than they are now."
-
-	ewarn
-	ewarn "If you build an initramfs including udev, then please"
-	ewarn "make sure that the /sbin/udevadm binary gets included,"
-	ewarn "and your scripts changed to use it,as it replaces the"
-	ewarn "old helper apps udevinfo, udevtrigger, ..."
-
-	ewarn
-	ewarn "mount options for directory /dev are no longer"
-	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
-	ewarn "as for other directories."
-
-	elog
-	elog "For more information on udev on Gentoo, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
-}
diff --git a/sys-fs/udev/udev-137.ebuild b/sys-fs/udev/udev-138.ebuild
index 38a4f8c52a10..46fd0aa6ebc1 100644
--- a/sys-fs/udev/udev-137.ebuild
+++ b/sys-fs/udev/udev-138.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.4 2009/01/27 10:42:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-138.ebuild,v 1.1 2009/02/19 08:41:34 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -90,12 +90,11 @@ src_unpack() {
 	cd "${S}"
 
 	# patches go here...
-	epatch "${FILESDIR}/${P}-rules-update.diff"
-	epatch "${FILESDIR}/${PN}-fix-udevinfo-in-doc.diff"
 
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/{rules.d,packages}/*.rules
+		-i rules/{rules.d,packages,gentoo}/*.rules \
+	|| die "failed to change group dialout to uucp"
 
 	if [[ ${PV} != 9999 ]]; then
 		# Make sure there is no sudden changes to upstream rules file