Version bumped, Bug #368331. Split extras use flag into a lot small ones, Bug #348472. Fix cross compiling issue, Bug #360397. Use systemd eclass, Bug #365943. Update minimum required kernel version.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

5 files changed, 594 insertions, 30 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index dba9f6c394fa..c9f0e53747d0 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.578 2011/06/05 18:24:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.579 2011/06/05 19:59:06 zzam Exp $
+
+*udev-171 (05 Jun 2011)
+
+  05 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-171.ebuild,
+  udev-9999.ebuild, metadata.xml:
+  Version bumped, Bug #368331. Split extras use flag into a lot small ones, Bug
+  #348472. Fix cross compiling issue, Bug #360397. Use systemd eclass, Bug
+  #365943. Update minimum required kernel version.
 
   05 Jun 2011; Jeroen Roovers <jer@gentoo.org> udev-164-r2.ebuild:
   Stable for HPPA (bug #352827).
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b496f8829954..220cc727dffb 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -115,6 +115,8 @@ DIST udev-164.tar.bz2 557126 RMD160 f169b21c955f96554b8c7af1fd174037e60dfe12 SHA
 DIST udev-167.tar.bz2 594474 RMD160 444f8ff62eb0a5b67621b5ea199e16bd0531a8b2 SHA1 f993ffb4430bfab666d997c643ed4b90a07e1e07 SHA256 bafaf33e8a39ae109a3e1b82eed72337776cad3e5cccacce8d909a44e09a32eb
 DIST udev-168-gentoo-patchset-v1.tar.bz2 1327 RMD160 a06ccdfcde0a5938ba1dde0c6abd1c7406bba14c SHA1 cac0776b5b448badedef41989b6f4c4bfd3fe575 SHA256 83b4666f1c597ba5aa0226d208dd1360d02812e5d745054f930136294486ec06
 DIST udev-168.tar.bz2 598171 RMD160 a58fc418553bfc208bdc1d33e6798e21d99c5896 SHA1 c5ad16c9a3b9a4317a49f2a091e776d1ac00a8fa SHA256 9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2
+DIST udev-171-gentoo-patchset-v1.tar.bz2 796 RMD160 ec60115b9a21866adc484430aa7d8400849e8710 SHA1 66936903026d49ab3b706f23d6713c2d0bfea7ba SHA256 9524e64068d67bb55ddad16dd36a27c3ef87323421254a5bfe2431693b1bc983
+DIST udev-171.tar.bz2 597937 RMD160 5b8f9f1e7ba353c58fef851f6f4e1f4c468540b4 SHA1 8b851f0e8681020b89a76a1e7a0273814fa2b24b SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef
 DIST udev-gentoo-scripts-164.tar.bz2 9506 RMD160 d1eea1660c3c760acf75bfcd72b4e1c0b2c53be3 SHA1 e79e677590f1b1574718d3c019a80c12e9267a5a SHA256 2c23fdfe0f509e1248fec2287af6f638e86393f7c848240cb34ab4d082492d8d
 DIST udev-gentoo-scripts-v3.tar.bz2 9534 RMD160 c4d311d241896987c9c24e31feff994fb8a629e5 SHA1 bdf2b5b0f7373c700562b8bfef5d419333ba4408 SHA256 4cae68974f15624f6387252e25cbcd1fcb67c7d4bf37c7cf08656843fcafbc2d
@@ -138,13 +140,14 @@ EBUILD udev-167.ebuild 14961 RMD160 afa8ef5e369263c51b4803aaadbcb50914cc525a SHA
 EBUILD udev-168-r1.ebuild 14746 RMD160 c24897881dc40a7138b3f15285ee9c0f12f3e90c SHA1 c77f74a4dbfc8307788db4fe4141521e7e348880 SHA256 ea22783e6185f8119da70db2ace32609d1149441a94b5b109466a785ae3ccfef
 EBUILD udev-168-r2.ebuild 14650 RMD160 dd554faa798a3f69fd20e4b76bf12b0c025b3817 SHA1 3b8c31887c811daed6339c27763859d4cfde65f3 SHA256 2a585aea1f95e7cfcd33d4733332ef0aa0ee62fcd94a1c8eb9139269b905d7b4
 EBUILD udev-168.ebuild 14630 RMD160 b637fad8db7169e0f7ab0c2489fbd791609efda6 SHA1 652911454c81bfcae28284d58a98e07e03a5787a SHA256 631d289eeb15df4dc2aefcefd79e8054d00cddf7d0fe4b574774b514ea70d704
-EBUILD udev-9999.ebuild 14765 RMD160 ed169a39cc287fe5876e822b96c999a98543b955 SHA1 31ee010dec85ff614efd40267a4864f6127466c3 SHA256 6a5114ce5c42daa61348f3e594f53be931e98780e498ffc0c1764f245e673223
-MISC ChangeLog 119544 RMD160 28e3b691faf73c23c6d030acd7e067be75e726cc SHA1 f6e3946067761dbd6cad98f7e3c997cbeb15dc05 SHA256 11df6c7e90f775409ea6da3f09e865ddb1c6de819743911f40a511e774926492
-MISC metadata.xml 502 RMD160 f353faee03dd5920d1f7d65c123d93e018c7be53 SHA1 02c5eb9fd660e69127fa84487e0d70b85ee1d3cc SHA256 ca6a239a7be7949fdf1461eb524ca9234a0fd2aee9fc7eeb758a2347b6031664
+EBUILD udev-171.ebuild 15279 RMD160 58f5f3ca4ef66fe4f378a64056da0ac95ed93fbe SHA1 1d665a6af573e97b895c1ea2ed5d7a78ac1e794e SHA256 756551c1a0d645d126b2e0e0d80957b1d281ed671778027f06c433b9f2eb6e7e
+EBUILD udev-9999.ebuild 15205 RMD160 5e43403fa36aeca8d76aac8f1f5c59d5d9cfc43c SHA1 4e4e38fa55b3ba00bc0e05277405f4e7b944a00c SHA256 0aeef1c54bc6927f78742cd4bb1f57a965540c2d6e9648e9c486412cc383372b
+MISC ChangeLog 119882 RMD160 4a36e87f19db422d680773881a330d0e8ed4d8ca SHA1 886fddc6b50c3365fee036a064e9d17fc4e9816c SHA256 5252630d45531cdc2b47c93fb09bd7126ca5cc3f8a9a8620294892ca2c290898
+MISC metadata.xml 1261 RMD160 7af6ef904f506127cf67ac9b5eb4d2c9260843bf SHA1 484ff932a3a6885bd694347099417e51ce8f30a4 SHA256 d20b2751c0e01cce6d071565e57594157ec63a7ae33ef7ef401903fad78311c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3rydAACgkQVWmRsqeSphOW2gCfT8o/cCaf3S8Vxqw2K0ps3ibF
-VJsAn0h4MTfkFmIEu6KFQgDqRoQHPQPa
-=A21H
+iEYEARECAAYFAk3r39oACgkQt2vP6XvVdOdvNgCfXRPuIuzRPlxhsu+pQMKEb8hk
+vOUAn2h+GJYZHVg/l3av0z3b/gugk2L9
+=9nAC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml
index 38e7d54f3f2f..8df3cd8cc01f 100644
--- a/sys-fs/udev/metadata.xml
+++ b/sys-fs/udev/metadata.xml
@@ -6,8 +6,18 @@
   <email>udev-bugs@gentoo.org</email>
 </maintainer>
 <use>
+  <flag name="action_modeswitch">switch Mobile Action cables into serial mode</flag>
   <flag name="devfs-compat">Install rules for devfs compatible device names</flag>
+  <flag name="edd">create /dev/disk/by-id/edd-* links for BIOS EDD data</flag>
   <flag name="extras">Compile udev-extras requiring external dependencies</flag>
+  <flag name="floppy">create historical floppy kernel device nodes (/dev/fd0h1440, ...)</flag>
+  <flag name="gudev">enable libudev gobject interface</flag>
+  <flag name="hwdb">read vendor/device string database and add it to udev database</flag>
+  <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+  	for introspection</flag>
+  <flag name="keymap">map custom hardware's multimedia keys</flag>
   <flag name="old-hd-rules">Install rules for /dev/hd* devices, removed upstream at udev-148</flag>
+  <flag name="rule_generator">enable persistent network and optical device rule generator</flag>
+  <flag name="udev_acl">apply ACLs for users with local forground sessions</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-fs/udev/udev-171.ebuild b/sys-fs/udev/udev-171.ebuild
new file mode 100644
index 000000000000..33acb540b770
--- /dev/null
+++ b/sys-fs/udev/udev-171.ebuild
@@ -0,0 +1,534 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171.ebuild,v 1.1 2011/06/05 19:59:06 zzam Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib toolchain-funcs linux-info systemd
+
+PATCHSET=${P}-gentoo-patchset-v1
+scriptversion=v3
+scriptname=udev-gentoo-scripts-${scriptversion}
+
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI="mirror://gentoo/${scriptname}.tar.bz2"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+	EGIT_BRANCH="master"
+	inherit git autotools
+else
+	# please update testsys-tarball whenever udev-xxx/test/sys/ is changed
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+			 test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )
+			 mirror://gentoo/${scriptname}.tar.bz2"
+	[[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.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 test debug +rule_generator +hwdb +udev_acl +gudev introspection +keymap floppy edd action_modeswitch"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+	udev_acl? ( sys-apps/acl dev-libs/glib:2 )
+	gudev? ( dev-libs/glib:2 )
+	introspection? ( dev-libs/gobject-introspection )
+	action_modeswitch? ( virtual/libusb:0 )
+	>=sys-apps/util-linux-2.16
+	>=sys-libs/glibc-2.9"
+
+DEPEND="${COMMON_DEPEND}
+	keymap? ( dev-util/gperf )
+	dev-util/pkgconfig
+	virtual/os-headers
+	!<sys-kernel/linux-headers-2.6.29
+	test? ( app-text/tree )"
+
+RDEPEND="${COMMON_DEPEND}
+	hwdb?
+	(
+		>=sys-apps/usbutils-0.82
+		sys-apps/pciutils
+	)
+	!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
+	~!IDE"
+
+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 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=32
+	KV_PATCH_reliable=32
+	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} reliably." ;;
+		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
+}
+
+src_unpack() {
+	unpack ${A}
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		if use test; then
+			mv "${WORKDIR}"/test/sys "${S}"/test/
+		fi
+	fi
+
+	#cd "${WORKDIR}/${scriptname}"
+
+	cd "${S}"
+
+	# patches go here...
+
+	# backport some patches
+	if [[ -n "${PATCHSET}" ]]; then
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+			  EPATCH_FORCE="yes" epatch
+	fi
+
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+		-i rules/{rules.d,arch}/*.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} != a9954d57e97aa0ad2e0ed53899d9559a ]]
+		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
+
+	if [[ ${PV} == 9999 ]]; then
+		gtkdocize --copy || die "gtkdocize failed"
+		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=/lib/udev \
+		--enable-logging \
+		--enable-static \
+		$(use_with selinux) \
+		$(use_enable debug) \
+		$(use_enable rule_generator) \
+		$(use_enable hwdb) \
+		--with-pci-ids-path=/usr/share/misc/pci.ids \
+		--with-usb-ids-path=/usr/share/misc/usb.ids \
+		$(use_enable udev_acl) \
+		$(use_enable gudev) \
+		$(use_enable introspection) \
+		$(use_enable keymap) \
+		$(use_enable floppy) \
+		$(use_enable edd) \
+		$(use_enable action_modeswitch) \
+		$(systemd_with_unitdir)
+
+	emake || die "compiling udev failed"
+}
+
+src_install() {
+	emake -C "${WORKDIR}/${scriptname}" \
+		DESTDIR="${D}" LIBDIR="$(get_libdir)" \
+		KV_min="${KV_min}" KV_reliable="${KV_reliable}" \
+		install || die "make install failed"
+
+	into /
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	exeinto /lib/udev
+	keepdir /lib/udev/state
+	keepdir /lib/udev/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "../lib/udev/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 /lib/udev/rules.d/
+
+	# support older kernels
+	doins misc/30-kernel-compat.rules
+
+	# Adding arch specific rules
+	if [[ -f arch/40-${ARCH}.rules ]]
+	then
+		doins "arch/40-${ARCH}.rules"
+	fi
+	cd "${S}"
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/blacklist-146 blacklist.conf
+	newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
+
+	# 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 keymap; then
+		dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
+	fi
+}
+
+pkg_preinst() {
+	# moving old files to support newer modprobe, 12 May 2009
+	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
+
+	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=$?
+}
+
+# 19 Nov 2008
+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
+}
+
+postinst_init_scripts() {
+	local enable_postmount=false
+
+	# FIXME: inconsistent handling of init-scripts here
+	#  * udev is added to sysinit in openrc-ebuild
+	#  * we add udev-postmount to default in here
+	#
+
+	# If we are building stages, add udev to the sysinit runlevel automatically.
+	if use build
+	then
+		if [[ -x "${ROOT}"/etc/init.d/udev  \
+			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
+		then
+			ln -s "${ROOT}"/etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+		fi
+		enable_postmount=true
+	fi
+
+	# migration to >=openrc-0.4
+	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
+
+	# add udev-postmount to default runlevel instead of that ugly injecting
+	# like a hotplug event, 2009/10/15
+
+	# already enabled?
+	[[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return
+
+	[[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
+	[[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
+
+	if $enable_postmount
+	then
+		local initd=udev-postmount
+
+		if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
+			[[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
+		then
+			ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
+			elog "Auto-adding '${initd}' service to your default runlevel"
+		fi
+	else
+		elog "You should add the udev-postmount service to default runlevel."
+		elog "Run this to add it:"
+		elog "\trc-update add udev-postmount default"
+	fi
+}
+
+pkg_postinst() {
+	fix_old_persistent_net_rules
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT}"/dev/loop 2>/dev/null
+	if [[ -d "${ROOT}"/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	restart_udevd
+
+	postinst_init_scripts
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	# delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007
+	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, 25 Jan 2007
+	if [[ -d ${ROOT}/lib/udev/devices ]]
+	then
+		rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Removing some old file, 29 Jan 2007
+	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
+
+	# 19 Mar 2007
+	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, 23 Apr 2007
+	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, 27 Jun 2007
+	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."
+
+	ewarn
+	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 have been removed."
+	ewarn "For reference see Bug #269359."
+
+	ewarn
+	ewarn "Rules for /dev/hd* devices have been removed"
+	ewarn "Please migrate to libata."
+
+	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 c9f3816c7a53..22c439081122 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2011 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.38 2011/06/02 20:26:43 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.39 2011/06/05 19:59:06 zzam Exp $
 
 EAPI="1"
 
-inherit eutils flag-o-matic multilib toolchain-funcs linux-info autotools
+inherit eutils flag-o-matic multilib toolchain-funcs linux-info systemd
 
-#PATCHSET=${P}-gentoo-patchset-v1
+PATCHSET=${P}-gentoo-patchset-v1
 scriptversion=v3
-scriptname=${PN}-gentoo-scripts-${scriptversion}
+scriptname=udev-gentoo-scripts-${scriptversion}
 
 if [[ ${PV} == "9999" ]]; then
 	SRC_URI="mirror://gentoo/${scriptname}.tar.bz2"
@@ -28,29 +28,29 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="selinux extras test"
+IUSE="selinux test debug +rule_generator +hwdb +udev_acl +gudev introspection +keymap floppy edd action_modeswitch"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
-	extras? (
-		sys-apps/acl
-		>=sys-apps/usbutils-0.82
-		virtual/libusb:0
-		sys-apps/pciutils
-		dev-libs/glib:2
-	)
+	udev_acl? ( sys-apps/acl dev-libs/glib:2 )
+	gudev? ( dev-libs/glib:2 )
+	introspection? ( dev-libs/gobject-introspection )
+	action_modeswitch? ( virtual/libusb:0 )
 	>=sys-apps/util-linux-2.16
 	>=sys-libs/glibc-2.9"
 
 DEPEND="${COMMON_DEPEND}
-	extras? (
-		dev-util/gperf
-		dev-util/pkgconfig
-	)
+	keymap? ( dev-util/gperf )
+	dev-util/pkgconfig
 	virtual/os-headers
 	!<sys-kernel/linux-headers-2.6.29
 	test? ( app-text/tree )"
 
 RDEPEND="${COMMON_DEPEND}
+	hwdb?
+	(
+		>=sys-apps/usbutils-0.82
+		sys-apps/pciutils
+	)
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
@@ -88,8 +88,8 @@ pkg_setup() {
 	# 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=31
+	KV_PATCH_min=32
+	KV_PATCH_reliable=32
 	KV_min=2.6.${KV_PATCH_min}
 	KV_reliable=2.6.${KV_PATCH_reliable}
 
@@ -187,10 +187,19 @@ src_compile() {
 		--enable-logging \
 		--enable-static \
 		$(use_with selinux) \
-		$(use_enable extras) \
-		--disable-introspection \
-		--without-systemdsystemunitdir
-	# we don't have gobject-introspection in portage tree
+		$(use_enable debug) \
+		$(use_enable rule_generator) \
+		$(use_enable hwdb) \
+		--with-pci-ids-path=/usr/share/misc/pci.ids \
+		--with-usb-ids-path=/usr/share/misc/usb.ids \
+		$(use_enable udev_acl) \
+		$(use_enable gudev) \
+		$(use_enable introspection) \
+		$(use_enable keymap) \
+		$(use_enable floppy) \
+		$(use_enable edd) \
+		$(use_enable action_modeswitch) \
+		$(systemd_with_unitdir)
 
 	emake || die "compiling udev failed"
 }
@@ -242,7 +251,7 @@ src_install() {
 
 	# keep doc in just one directory, Bug #281137
 	rm -rf "${D}/usr/share/doc/${PN}"
-	if use extras; then
+	if use keymap; then
 		dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
 	fi
 }