Version bumped. Add permission for libusb printer devices for cups 1.4+, add disabled blacklist entry for usblp, Bug #285166. Now require kernel 2.6.27 to be safe, Bug #281312. Sync with udev-9999 and no longer allow to disable docs.

(Portage version: 2.2_rc40/cvs/Linux i686)

6 files changed, 712 insertions, 91 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a441261563ba..8793ef3b896a 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,16 @@
 # 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.490 2009/09/06 23:38:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.491 2009/09/19 17:41:52 zzam Exp $
+
+*udev-146 (19 Sep 2009)
+
+  19 Sep 2009; Matthias Schwarzott <zzam@gentoo.org> +files/blacklist-146,
+  +udev-146.ebuild, +files/udev-146-printer-usb_device-permission.diff,
+  udev-9999.ebuild, -files/udev-9999-disable-doc.diff:
+  Version bumped. Add permission for libusb printer devices for cups 1.4+,
+  add disabled blacklist entry for usblp, Bug #285166. Now require kernel
+  2.6.27 to be safe, Bug #281312. Sync with udev-9999 and no longer allow to
+  disable docs.
 
   06 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> udev-145-r1.ebuild:
   Use proper kernel_is function to compare properly including the 4 argument
diff --git a/sys-fs/udev/files/blacklist-146 b/sys-fs/udev/files/blacklist-146
new file mode 100644
index 000000000000..90bc234b2bec
--- /dev/null
+++ b/sys-fs/udev/files/blacklist-146
@@ -0,0 +1,29 @@
+# This file lists modules which will not be loaded by udev,
+# not at coldplugging and not on hotplug events.
+
+# Add your own entries to this file
+# in the format "blacklist <name of module>"
+
+# Some examples:
+# evbug is a debug tool and should be loaded explicitly
+blacklist evbug
+
+# Autoloading eth1394 most of the time re-orders your network
+# interfaces, and with buggy kernel 2.6.21, udev persistent-net
+# is not able to rename these devices, so you get eth?_rename devices
+# plus an exceeded 30sec boot timeout
+blacklist eth1394
+
+# You probably want this to not get the console beep loud on every tab :)
+#blacklist pcspkr
+
+# these drivers are very simple, the HID drivers are usually preferred
+#blacklist usbmouse
+#blacklist usbkbd
+
+# Sometimes loading a framebuffer driver at boot gets the console black
+#install pci:v*d*sv*sd*bc03sc*i* /bin/true
+
+# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded
+#blacklist usblp
+
diff --git a/sys-fs/udev/files/udev-146-printer-usb_device-permission.diff b/sys-fs/udev/files/udev-146-printer-usb_device-permission.diff
new file mode 100644
index 000000000000..5e6c2d0261d4
--- /dev/null
+++ b/sys-fs/udev/files/udev-146-printer-usb_device-permission.diff
@@ -0,0 +1,31 @@
+commit f61e72d8973cf9d889a4f1233150870085c0b3e1
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Date:   Fri Sep 4 17:12:28 2009 +0200
+
+    make raw USB printer devices accessible for lp
+    
+    Starting from version 1.4, cups now uses libusb and printer USB devices instead
+    of the usblp generated /dev/usb/lpX ones. In order to not require the cups USB
+    backend to run as root now, change raw USB printer devices to be root:lp 0660,
+    similar to usblpX devices.
+    
+    This might also enable the hplip backend to not run as root, since this has
+    always used raw device nodes.
+    
+    https://launchpad.net/bugs/420015
+
+diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
+index 2507420..4e9a737 100644
+--- a/rules/rules.d/50-udev-default.rules
++++ b/rules/rules.d/50-udev-default.rules
+@@ -60,6 +60,10 @@ SUBSYSTEM=="ppdev",		GROUP="lp"
+ SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
+ KERNEL=="lp[0-9]*",		GROUP="lp"
+ KERNEL=="irlpt[0-9]*",		GROUP="lp"
++# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
++# the ones from the old usblp kernel module
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="660"
+ 
+ # block
+ SUBSYSTEM=="block", GROUP="disk"
diff --git a/sys-fs/udev/files/udev-9999-disable-doc.diff b/sys-fs/udev/files/udev-9999-disable-doc.diff
deleted file mode 100644
index d92cd1c08d74..000000000000
--- a/sys-fs/udev/files/udev-9999-disable-doc.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 221e91f..f2a6198 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = . libudev/docs
-+SUBDIRS = .
- 
- udevconfdir = $(sysconfdir)/udev
- dist_udevconf_DATA = \
-@@ -447,8 +447,7 @@ libgudev_include_HEADERS = \
- 
- pkgconfig_DATA += extras/gudev/gudev-1.0.pc
- 
--SUBDIRS += \
--	extras/gudev/docs
-+SUBDIRS +=
- endif
- 
- if ENABLE_INTROSPECTION
-diff --git a/configure.ac b/configure.ac
-index 727cba6..bbd3775 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,7 +8,6 @@ AC_SYS_LARGEFILE
- AC_CONFIG_MACRO_DIR([m4])
- LT_INIT
- AC_PROG_AWK
--GTK_DOC_CHECK(1.10)
- AC_PREFIX_DEFAULT([/usr])
- AC_PATH_PROG([XSLTPROC], [xsltproc])
- 
-@@ -102,12 +101,8 @@ AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_FILES([
- 	Makefile
- 	libudev/libudev.pc
--	libudev/docs/Makefile
--	libudev/docs/version.xml
- 	udev/udev.pc
- 	extras/gudev/gudev-1.0.pc
--	extras/gudev/docs/Makefile
--	extras/gudev/docs/version.xml
- ])
- 
- AC_OUTPUT
diff --git a/sys-fs/udev/udev-146.ebuild b/sys-fs/udev/udev-146.ebuild
new file mode 100644
index 000000000000..0e22205cf3b7
--- /dev/null
+++ b/sys-fs/udev/udev-146.ebuild
@@ -0,0 +1,538 @@
+# 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-146.ebuild,v 1.1 2009/09/19 17:41:52 zzam Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib toolchain-funcs linux-info
+
+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)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux +devfs-compat -extras"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+	extras? (
+		sys-apps/acl
+		>=sys-apps/usbutils-0.82
+		dev-libs/libusb
+		sys-apps/pciutils
+		dev-libs/glib:2
+	)
+	>=sys-apps/util-linux-2.16
+	>=sys-libs/glibc-2.7"
+
+DEPEND="${COMMON_DEPEND}
+	extras? ( dev-util/gperf )"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/coldplug
+	!<sys-fs/lvm2-2.02.45
+	!sys-fs/device-mapper
+	>=sys-apps/baselayout-1.12.5"
+
+if [[ ${PV} == "9999" ]]; then
+	# for documentation processing with xsltproc
+	DEPEND="${DEPEND}
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd
+		dev-util/gtk-doc"
+fi
+
+# required kernel options
+CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+udev_check_KV() {
+	local ok=0
+	if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]]
+	then
+		if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then
+			ok=2
+		elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then
+			ok=1
+		fi
+	fi
+	return $ok
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	udev_libexec_dir="/$(get_libdir)/udev"
+
+	# udev requires signalfd introduced in kernel 2.6.25,
+	# but a glibc compiled against >=linux-headers-2.6.27 uses the
+	# new signalfd syscall introduced in kernel 2.6.27 without falling back
+	# to the old one. So we just depend on 2.6.27 here, see Bug #281312.
+	KV_PATCH_min=25
+	KV_PATCH_reliable=27
+	KV_min=2.6.${KV_PATCH_min}
+	KV_reliable=2.6.${KV_PATCH_reliable}
+
+	# always print kernel version requirements
+	ewarn
+	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+	if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then
+		ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
+	fi
+
+	echo
+	# We don't care about the secondary revision of the kernel.
+	# 2.6.30.4 -> 2.6.30 is all we check
+	udev_check_KV
+	case "$?" in
+		2)	einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliable." ;;
+		1)	ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
+			ewarn "but it may be unreliable in some cases."
+			ebeep ;;
+		0)	eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+			ebeep ;;
+	esac
+	echo
+
+	KV_FULL_SRC=${KV_FULL}
+	get_running_version
+	udev_check_KV
+	if [[ "$?" = "0" ]]; then
+		eerror
+		eerror "udev cannot be restarted after emerging,"
+		eerror "as your running kernel version (${KV_FULL}) is too old."
+		eerror "You really need to use a newer kernel after a reboot!"
+		NO_RESTART=1
+		ebeep
+	fi
+}
+
+sed_libexec_dir() {
+	sed -e "s#/lib/udev#${udev_libexec_dir}#" -i "$@"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+
+	cd "${S}"
+
+	# patches go here...
+
+	# allow cups to access usb_device nodes of printers, Bug #285166
+	epatch "${FILESDIR}"/udev-146-printer-usb_device-permission.diff
+
+	if ! use devfs-compat; then
+		# see Bug #269359
+		epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
+	fi
+
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+		-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
+		# (more for my own needs than anything else ...)
+		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
+		MD5=${MD5/  -/}
+		if [[ ${MD5} != c1ad7decce54b92a3bee448fa95783f9 ]]
+		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_libexec_dir \
+		rules/rules.d/50-udev-default.rules \
+		rules/rules.d/78-sound-card.rules \
+		extras/rule_generator/write_*_rules \
+		|| die "sed failed"
+
+	if [[ ${PV} == 9999 ]]; then
+		gtkdocize --copy
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	econf \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--sbindir=/sbin \
+		--libdir=/usr/$(get_libdir) \
+		--with-rootlibdir=/$(get_libdir) \
+		--libexecdir="${udev_libexec_dir}" \
+		--enable-logging \
+		$(use_with selinux) \
+		$(use_enable extras)
+
+	emake || die "compiling udev failed"
+}
+
+src_install() {
+	local scriptdir="${FILESDIR}/136"
+
+	into /
+	emake DESTDIR="${D}" install || die "make install failed"
+	# without this code, multilib-strict is angry
+	if [[ "$(get_libdir)" != "lib" ]]; then
+		# check if this code is needed, bug #281338
+		if [[ -d "${D}/lib" ]]; then
+			# we can not just rename /lib to /lib64, because
+			# make install creates /lib64 and /lib
+			einfo "Moving lib to $(get_libdir)"
+			mkdir -p "${D}/$(get_libdir)"
+			mv "${D}"/lib/* "${D}/$(get_libdir)/"
+			rmdir "${D}"/lib
+		else
+			einfo "There is no ${D}/lib, move code can be deleted."
+		fi
+	fi
+
+	exeinto "${udev_libexec_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_libexec_dir}"/state
+	keepdir "${udev_libexec_dir}"/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "..${udev_libexec_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_libexec_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_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-146 blacklist.conf
+	newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
+
+	# convert /lib/udev to real used dir
+	sed_libexec_dir \
+		"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
+		"${D}/${udev_libexec_dir}"/write_root_link_rule \
+		"${D}"/etc/conf.d/udev \
+		"${D}"/etc/init.d/udev* \
+		"${D}"/etc/modprobe.d/*
+
+	# documentation
+	dodoc ChangeLog README TODO || die "failed installing docs"
+
+	# keep doc in just one directory, Bug #281137
+	rm -rf "${D}/usr/share/doc/${PN}"
+	if use extras; then
+		dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
+	fi
+
+	cd docs/writing_udev_rules
+	mv index.html writing_udev_rules.html
+	dohtml *.html
+	cd "${S}"
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev
+	doenvd 20udev
+}
+
+pkg_preinst() {
+	local f dir=${ROOT}/etc/modprobe.d/
+	for f in pnp-aliases blacklist; do
+		if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
+		then
+			elog "Moving $dir/$f to $f.conf"
+			mv -f "$dir/$f" "$dir/$f.conf"
+		fi
+	done
+
+	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() {
+	if [[ ${NO_RESTART} = "1" ]]; then
+		ewarn "Not restarting udevd, as your kernel is too old!"
+		return
+	fi
+
+	# 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
+	sleep 3
+	if [[ ! -n $(pidof udevd) ]]; then
+		eerror "FATAL: udev died, please check your kernel is"
+		eerror "new enough and configured correctly for ${P}."
+		eerror
+		eerror "Please have a look at this before rebooting."
+		eerror "If in doubt, please downgrade udev back to your old version"
+		ebeep
+	fi
+}
+
+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 #275974, added 2009/09/05
+	ewarn
+	ewarn "If after the udev update removable devices or CD/DVD drives"
+	ewarn "stop working, try re-emerging HAL before filling a bug report"
+
+	# 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."
+
+	if use devfs-compat; then
+		ewarn
+		ewarn "You have devfs-compat use flag enabled."
+		ewarn "This enables devfs compatible device names."
+		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
+		ewarn "then please migrate over to using the device names"
+		ewarn "/dev/md*, /dev/loop* and /dev/ram*."
+		ewarn "The devfs-compat rules will be removed in the future."
+		ewarn "For reference see Bug #269359."
+	fi
+
+	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-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 0e681bf7cba0..c3594f5bcb9b 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.12 2009/07/16 07:40:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.13 2009/09/19 17:41:52 zzam Exp $
 
 EAPI="1"
 
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
+inherit eutils flag-o-matic multilib toolchain-funcs linux-info
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
@@ -29,14 +29,16 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 		sys-apps/pciutils
 		dev-libs/glib:2
 	)
-	>=sys-apps/util-linux-2.16"
+	>=sys-apps/util-linux-2.16
+	>=sys-libs/glibc-2.7"
 
 DEPEND="${COMMON_DEPEND}
 	extras? ( dev-util/gperf )"
 
 RDEPEND="${COMMON_DEPEND}
 	!sys-apps/coldplug
-	!<sys-fs/device-mapper-1.02.19-r1
+	!<sys-fs/lvm2-2.02.45
+	!sys-fs/device-mapper
 	>=sys-apps/baselayout-1.12.5"
 
 if [[ ${PV} == "9999" ]]; then
@@ -44,47 +46,72 @@ if [[ ${PV} == "9999" ]]; then
 	DEPEND="${DEPEND}
 		app-text/docbook-xsl-stylesheets
 		app-text/docbook-xml-dtd
-		doc? ( dev-util/gtk-doc )"
-	IUSE="${IUSE} -doc"
+		dev-util/gtk-doc"
 fi
 
+# required kernel options
+CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+
 # We need the lib/rcscripts/addon support
 PROVIDE="virtual/dev-manager"
 
-pkg_setup() {
-	udev_libexec_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=25 KV_min_micro_reliable=25
-	KV_min=2.6.${KV_min_micro}
-	KV_min_reliable=2.6.${KV_min_micro_reliable}
-
+udev_check_KV() {
 	local ok=0
 	if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]]
 	then
-		if [[ ${KV_MICRO} -ge ${KV_min_micro_reliable} ]]; then
+		if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then
 			ok=2
-		elif [[ ${KV_MICRO} -ge ${KV_min_micro} ]]; then
+		elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then
 			ok=1
 		fi
 	fi
+	return $ok
+}
 
-	if [[ ${ok} -lt 1 ]]
-	then
-		ewarn
-		ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+pkg_setup() {
+	linux-info_pkg_setup
+
+	udev_libexec_dir="/$(get_libdir)/udev"
+
+	# udev requires signalfd introduced in kernel 2.6.25,
+	# but a glibc compiled against >=linux-headers-2.6.27 uses the
+	# new signalfd syscall introduced in kernel 2.6.27 without falling back
+	# to the old one. So we just depend on 2.6.27 here, see Bug #281312.
+	KV_PATCH_min=25
+	KV_PATCH_reliable=27
+	KV_min=2.6.${KV_PATCH_min}
+	KV_reliable=2.6.${KV_PATCH_reliable}
+
+	# always print kernel version requirements
+	ewarn
+	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+	if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then
+		ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
 	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
+
+	echo
+	# We don't care about the secondary revision of the kernel.
+	# 2.6.30.4 -> 2.6.30 is all we check
+	udev_check_KV
+	case "$?" in
+		2)	einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliable." ;;
+		1)	ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
+			ewarn "but it may be unreliable in some cases."
+			ebeep ;;
+		0)	eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+			ebeep ;;
+	esac
+	echo
+
+	KV_FULL_SRC=${KV_FULL}
+	get_running_version
+	udev_check_KV
+	if [[ "$?" = "0" ]]; then
+		eerror
+		eerror "udev cannot be restarted after emerging,"
+		eerror "as your running kernel version (${KV_FULL}) is too old."
+		eerror "You really need to use a newer kernel after a reboot!"
+		NO_RESTART=1
 		ebeep
 	fi
 }
@@ -103,6 +130,10 @@ src_unpack() {
 	cd "${S}"
 
 	# patches go here...
+
+	# allow cups to access usb_device nodes of printers, Bug #285166
+	epatch "${FILESDIR}"/udev-146-printer-usb_device-permission.diff
+
 	if ! use devfs-compat; then
 		# see Bug #269359
 		epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
@@ -118,7 +149,7 @@ src_unpack() {
 		# (more for my own needs than anything else ...)
 		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
 		MD5=${MD5/  -/}
-		if [[ ${MD5} != b5c2f014a48a53921de37c4e469aab96 ]]
+		if [[ ${MD5} != c1ad7decce54b92a3bee448fa95783f9 ]]
 		then
 			echo
 			eerror "50-udev-default.rules has been updated, please validate!"
@@ -134,11 +165,7 @@ src_unpack() {
 		|| die "sed failed"
 
 	if [[ ${PV} == 9999 ]]; then
-		if use doc; then
-			gtkdocize --copy
-		else
-			epatch "${FILESDIR}/udev-9999-disable-doc.diff"
-		fi
+		gtkdocize --copy
 		eautoreconf
 	fi
 }
@@ -165,12 +192,19 @@ src_install() {
 
 	into /
 	emake DESTDIR="${D}" install || die "make install failed"
+	# without this code, multilib-strict is angry
 	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
+		# check if this code is needed, bug #281338
+		if [[ -d "${D}/lib" ]]; then
+			# we can not just rename /lib to /lib64, because
+			# make install creates /lib64 and /lib
+			einfo "Moving lib to $(get_libdir)"
+			mkdir -p "${D}/$(get_libdir)"
+			mv "${D}"/lib/* "${D}/$(get_libdir)/"
+			rmdir "${D}"/lib
+		else
+			einfo "There is no ${D}/lib, move code can be deleted."
+		fi
 	fi
 
 	exeinto "${udev_libexec_dir}"
@@ -205,7 +239,6 @@ src_install() {
 
 	# Our rules files
 	doins gentoo/??-*.rules
-	doins packages/40-alsa.rules
 	doins packages/40-isdn.rules
 
 	# Adding arch specific rules
@@ -231,7 +264,7 @@ src_install() {
 
 	# insert minimum kernel versions
 	sed -e "s/%KV_MIN%/${KV_min}/" \
-		-e "s/%KV_MIN_RELIABLE%/${KV_min_reliable}/" \
+		-e "s/%KV_MIN_RELIABLE%/${KV_reliable}/" \
 		-i "${D}"/etc/init.d/udev-mount
 
 	# config file for init-script and start-addon
@@ -239,7 +272,7 @@ src_install() {
 		|| die "config file not installed properly"
 
 	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/blacklist-110 blacklist.conf
+	newins "${FILESDIR}"/blacklist-146 blacklist.conf
 	newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
 
 	# convert /lib/udev to real used dir
@@ -253,6 +286,12 @@ src_install() {
 	# documentation
 	dodoc ChangeLog README TODO || die "failed installing docs"
 
+	# keep doc in just one directory, Bug #281137
+	rm -rf "${D}/usr/share/doc/${PN}"
+	if use extras; then
+		dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
+	fi
+
 	cd docs/writing_udev_rules
 	mv index.html writing_udev_rules.html
 	dohtml *.html
@@ -340,6 +379,11 @@ fix_old_persistent_net_rules() {
 
 # See Bug #129204 for a discussion about restarting udevd
 restart_udevd() {
+	if [[ ${NO_RESTART} = "1" ]]; then
+		ewarn "Not restarting udevd, as your kernel is too old!"
+		return
+	fi
+
 	# need to merge to our system
 	[[ ${ROOT} = / ]] || return
 
@@ -360,6 +404,15 @@ restart_udevd() {
 	killall -9 udevd &>/dev/null
 
 	/sbin/udevd --daemon
+	sleep 3
+	if [[ ! -n $(pidof udevd) ]]; then
+		eerror "FATAL: udev died, please check your kernel is"
+		eerror "new enough and configured correctly for ${P}."
+		eerror
+		eerror "Please have a look at this before rebooting."
+		eerror "If in doubt, please downgrade udev back to your old version"
+		ebeep
+	fi
 }
 
 pkg_postinst() {
@@ -440,6 +493,11 @@ pkg_postinst() {
 			einfo "Removed unneeded file 64-device-mapper.rules"
 	fi
 
+	# requested in bug #275974, added 2009/09/05
+	ewarn
+	ewarn "If after the udev update removable devices or CD/DVD drives"
+	ewarn "stop working, try re-emerging HAL before filling a bug report"
+
 	# requested in Bug #225033:
 	elog
 	elog "persistent-net does assigning fixed names to network devices."