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

(Portage version: 2.1.3.9)

9 files changed, 20 insertions, 686 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/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