udev 180 version bump. This version uses the split udev-init-scripts package for bug #396181.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 410 insertions, 128 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index aa935564592e..b48a5a7e29b7 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.636 2012/02/01 21:55:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.637 2012/02/03 19:22:43 williamh Exp $
+
+*udev-180 (03 Feb 2012)
+
+  03 Feb 2012; William Hubbs <williamh@gentoo.org> +udev-180.ebuild,
+  udev-9999.ebuild:
+  udev 180 version bump. This version uses the split udev-init-scripts package
+  for bug #396181.
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> udev-171-r5.ebuild:
   Marking udev-171-r5 ppc for bug 399717
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 5a56fd9fda66..199ea0f92daf 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
@@ -113,6 +116,7 @@ DIST udev-171-gentoo-patchset-v1.tar.bz2 796 RMD160 ec60115b9a21866adc484430aa7d
 DIST udev-171-testsys.tar.bz2 155001 RMD160 c73d2e52bcca8cd84f9467f8e26ef6efaf5744c2 SHA1 c1ced44f6a1a21e9b0db4c538f605960e750149e SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc
 DIST udev-171.tar.bz2 597937 RMD160 5b8f9f1e7ba353c58fef851f6f4e1f4c468540b4 SHA1 8b851f0e8681020b89a76a1e7a0273814fa2b24b SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e
 DIST udev-175.tar.bz2 616780 RMD160 3e568f3137e4f768be2122382b57bf1ceac2385c SHA1 2ef42ca4b11e6b9d0d5c7f47da39eb2e64695e44 SHA256 4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab
+DIST udev-180.tar.bz2 798731 RMD160 42b7a9ff0cb841be61dba91663b774a4c26f8424 SHA1 d6a64b5d81373b23b89584945989391e6a9dad99 SHA256 839c8af5de6d1075303f8d15ddfd8b0b00e5e55caff3198a0beb2fbd13940577
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef
 DIST udev-gentoo-scripts-6.tar.bz2 16242 RMD160 f6ba565ca36cd12a5ed07fdffda0f5dc864c271a SHA1 5891ac0550db26112cc180904ce46f3be43f950a SHA256 d319dd8a5496361561344c1c190dde1b9ffc0023a29875647a407ed577f2727f
 DIST udev-gentoo-scripts-7.tar.bz2 16248 RMD160 51d58ff81f24dc5eb5c696c54739cc4048503295 SHA1 261ee037dec7f3a4abee22e5bd31522cc69d01e0 SHA256 cef8d47fe3b023c40dde621e0c91a9d38b7e7b83de5bae53e71a9027dfc65de7
@@ -129,7 +133,15 @@ EBUILD udev-151-r4.ebuild 16663 RMD160 a86faa791d5ecf2d84b53881abae8db6507bd302
 EBUILD udev-164-r2.ebuild 15102 RMD160 7ed8900771e83abbd3f2a14dd880d5c7462310f2 SHA1 2533fed6842fc8b3708bcf1ca541a4f13508cb1f SHA256 cca3497d3e06df3da7cc387543f3dc367782755cb504855e50e7900ae99e6b35
 EBUILD udev-171-r5.ebuild 15557 RMD160 f8eb3781afee2634820ba00971afa655b380ccee SHA1 c67ccc8a0a96d51ff71b26e58372a5c185e820dd SHA256 2695738f04bfd1d61cb0d2fe3cc7e22228288286b39cdc4948e2217a81a280f1
 EBUILD udev-175-r1.ebuild 12652 RMD160 12df1ef9e4a3bdf7b77e54e9a9bcbbefa473d97b SHA1 955f3175a290f52cb4e3621da1054acdfc686ab5 SHA256 3896f79f3025c1669712bc8902d09438829e11a9c132fc8f1524776b96a5802c
-EBUILD udev-9999.ebuild 12396 RMD160 d4a0d680d94d316cde14158a702eaf47c51522b1 SHA1 77ee95bb85d56d8df66e70f47fb898c016c073c2 SHA256 e4624b5bc0643ad2cdbeeddbbbb2441c8d3ee30b9cffd9e45498f2c144eee9e0
-MISC ChangeLog 23444 RMD160 b5b9dc906163c16bf525d6aabc1abab30711f7c2 SHA1 4c071ade03be86340b400ebd7bb70e7af5b87369 SHA256 eed99c9febed3749818f15835d1faedc8a82c0145151b49c18916b2aa5012746
+EBUILD udev-180.ebuild 9778 RMD160 7640cae861b5cdbb39a3688690c0d1c69dc396e4 SHA1 67f554adbfe4839789b533f106b8f81b964e069e SHA256 358c780c67dfb53493f909ef73a2a533c4bdf10cd9e8f47d3dad60c8f6f1706f
+EBUILD udev-9999.ebuild 9822 RMD160 a9a3c4b1989397d00e9019bb7019c65ac3cfd5c8 SHA1 205932a15f08e21ec73d975c8ccb8f016f169add SHA256 90822f669e8ab3eb0b8e86fc7e9bb167692973447852f7489124b4ee155077b8
+MISC ChangeLog 23659 RMD160 2b5324f52d97ace3324060e5350ac43d823e99df SHA1 60a6ebc3369fc170ededc9afbc35c6b88995d487 SHA256 353b4c253b202ffe01a7d116ffc48f284e10e22a963bc8fbe658cfb0c96bbab7
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk8sNAkACgkQblQW9DDEZTguAACgia14lm37kaZMm4bM7w/ClKZK
+yncAnjZVVsyMu8jY+vrrnGOY/CSFLOjE
+=0CSo
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-180.ebuild b/sys-fs/udev/udev-180.ebuild
new file mode 100644
index 000000000000..304b4d29c0ec
--- /dev/null
+++ b/sys-fs/udev/udev-180.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-180.ebuild,v 1.1 2012/02/03 19:22:43 williamh Exp $
+
+EAPI=4
+
+KV_min=2.6.34
+# patchversion=1
+udev_rules_md5=ebc2cf422aa9e46cf7d9a555670412ba
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+
+[[ ${PV} == "9999" ]] && vcs="git-2 autotools"
+inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
+
+if [[ ${PV} != "9999" ]]
+then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+	if [[ -n "${patchversion}" ]]
+	then
+		patchset=${P}-patchset-${patchversion}
+		SRC_URI="${SRC_URI} mirror://gentoo/${patchset}.tar.bz2"
+	fi
+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"
+IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
+	keymap floppy edd doc static-libs"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( sys-apps/acl dev-libs/glib:2 )
+	gudev? ( dev-libs/glib:2 )
+	introspection? ( dev-libs/gobject-introspection )
+	>=sys-apps/util-linux-2.20
+	>=sys-libs/glibc-2.10"
+
+DEPEND="${COMMON_DEPEND}
+	keymap? ( dev-util/gperf )
+	dev-util/pkgconfig
+	virtual/os-headers
+	!<sys-kernel/linux-headers-2.6.34"
+
+if [[ $PV == "9999" ]]
+then
+	RESTRICT="test? ( userpriv )"
+	IUSE="${IUSE} test"
+	DEPEND="${DEPEND}
+		dev-util/gtk-doc
+		test? ( app-text/tree )"
+else
+	DEPEND="${DEPEND}
+	doc? ( dev-util/gtk-doc )"
+fi
+
+RDEPEND="${COMMON_DEPEND}
+	hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
+	acl? ( sys-apps/coreutils[acl] )
+	sys-fs/udev-init-scripts
+	!sys-apps/coldplug
+	!<sys-fs/lvm2-2.02.45
+	!sys-fs/device-mapper
+	>=sys-apps/baselayout-1.12.5"
+
+# required kernel options
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~HOTPLUG ~INOTIFY_USER ~NET ~PROC_FS
+	~SIGNALFD ~SYSFS ~TMPFS_POSIX_ACL
+	~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+
+udev_check_KV()
+{
+	if kernel_is lt ${KV_min//./ }
+	then
+		return 1
+	fi
+	return 0
+}
+
+pkg_setup()
+{
+	linux-info_pkg_setup
+
+	# always print kernel version requirements
+	ewarn
+	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+
+	if ! udev_check_KV
+	then
+		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+	fi
+
+	KV_FULL_SRC=${KV_FULL}
+	get_running_version
+	if ! udev_check_KV
+	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
+	fi
+}
+
+src_prepare()
+{
+	# 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 [ ! -e configure ]
+	then
+		gtkdocize --copy || die "gtkdocize failed"
+		eautoreconf
+	else
+		# Make sure there are 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} != ${udev_rules_md5} ]]
+		then
+			eerror "50-udev-default.rules has been updated, please validate!"
+			eerror "md5sum: ${MD5}"
+			die "50-udev-default.rules has been updated, please validate!"
+		fi
+		elibtoolize
+	fi
+}
+
+src_configure()
+{
+	filter-flags -fprefetch-loop-arrays
+	econf \
+		--with-rootprefix=/ \
+		--libdir=/usr/$(get_libdir) \
+		--libexecdir=/lib \
+		$(use_enable static-libs 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 acl udev_acl) \
+		$(use_enable gudev) \
+		$(use_enable introspection) \
+		$(use_enable keymap) \
+		$(use_enable floppy) \
+		$(use_enable edd) \
+		$(use_enable doc gtk-doc) \
+		$(systemd_with_unitdir)
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
+
+	# documentation
+	dodoc ChangeLog README TODO
+
+	if use keymap
+	then
+		dodoc src/extras/keymap/README.keymap.txt
+	fi
+
+	# udevadm is now in /usr/bin.
+	dosym /usr/bin/udevadm /sbin/udevadm
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "/lib/udevd/scsi_id" /sbin/scsi_id
+
+	# Now install rules
+	insinto /lib/udev/rules.d/
+
+	# support older kernels
+	doins rules/misc/30-kernel-compat.rules
+
+	# add arch specific rules
+	if [[ -f rules/arch/40-${ARCH}.rules ]]
+	then
+		doins "rules/arch/40-${ARCH}.rules"
+	fi
+}
+
+# 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 /run/udev exists
+	[[ -e /run/udev ]] || return
+
+	elog
+	elog "restarting udevd now."
+
+	killall -15 udevd &>/dev/null
+	sleep 1
+	killall -9 udevd &>/dev/null
+
+	/lib/udev/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"
+	fi
+}
+
+# This function determines if a directory is a mount point.
+# It was lifted from dracut.
+ismounted()
+{
+	while read a m a; do
+		[ "$m" = "$1" ] && return 0
+	done < "${ROOT}"/proc/mounts
+	return 1
+}
+
+pkg_postinst()
+{
+	mkdir -p "${ROOT}"/run
+	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
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	# 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
+
+	# 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 [[ -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 assigns 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 "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 /usr/bin/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."
+
+	ewarn
+	ewarn "action_modeswitch has been removed by upstream."
+	ewarn "Please use sys-apps/usb_modeswitch."
+
+	if ismounted /usr
+	then
+		ewarn
+		ewarn "Your system has /usr on a separate partition. This means"
+		ewarn "you will need to use an initramfs to pre-mount /usr before"
+		ewarn "udev runs."
+		ewarn "This must be set up before your next reboot, or you may"
+		ewarn "experience failures which are very difficult to troubleshoot."
+		ewarn "For a more detailed explanation, see the following URL:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
+	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 f8227e6424d0..d9a4b4b17d8d 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.67 2011/12/29 19:32:46 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.68 2012/02/03 19:22:43 williamh Exp $
 
 EAPI=4
 
 KV_min=2.6.34
 # patchversion=1
-scriptversion=6
-udev_rules_md5=7a7180a394e5bdea9011f68582b94fe8
+udev_rules_md5=ebc2cf422aa9e46cf7d9a555670412ba
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
 
 [[ ${PV} == "9999" ]] && vcs="git-2 autotools"
 inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
 
-scriptname=${PN}-gentoo-scripts
 if [[ ${PV} != "9999" ]]
 then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -24,8 +22,6 @@ then
 		patchset=${P}-patchset-${patchversion}
 		SRC_URI="${SRC_URI} mirror://gentoo/${patchset}.tar.bz2"
 	fi
-	scriptname="${scriptname}-${scriptversion}"
-	SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -34,7 +30,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
-	keymap floppy edd doc"
+	keymap floppy edd doc static-libs"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl dev-libs/glib:2 )
@@ -58,20 +54,22 @@ then
 		test? ( app-text/tree )"
 else
 	DEPEND="${DEPEND}
-		doc? ( dev-util/gtk-doc )"
+	doc? ( dev-util/gtk-doc )"
 fi
 
 RDEPEND="${COMMON_DEPEND}
 	hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
 	acl? ( sys-apps/coreutils[acl] )
+	sys-fs/udev-init-scripts
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
 	>=sys-apps/baselayout-1.12.5"
 
 # required kernel options
-CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
-	~!IDE ~BLK_DEV_BSG ~TMPFS_POSIX_ACL"
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~HOTPLUG ~INOTIFY_USER ~NET ~PROC_FS
+	~SIGNALFD ~SYSFS ~TMPFS_POSIX_ACL
+	~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
 
 udev_check_KV()
 {
@@ -107,22 +105,6 @@ pkg_setup()
 	fi
 }
 
-if [[ $PV == 9999 ]]
-then
-	src_unpack()
-	{
-		git-2_src_unpack
-		unset EGIT_BRANCH
-		unset EGIT_COMMIT
-		unset EGIT_DIR
-		unset EGIT_MASTER
-		EGIT_PROJECT="${scriptname}"
-		EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${scriptname}.git"
-		EGIT_SOURCEDIR="${WORKDIR}/${scriptname}"
-		git-2_src_unpack
-	}
-fi
-
 src_prepare()
 {
 	# backport some patches
@@ -137,9 +119,12 @@ src_prepare()
 		-i rules/{rules.d,arch}/*.rules \
 	|| die "failed to change group dialout to uucp"
 
-	if [[ ${PV} != 9999 ]]
+	if [ ! -e configure ]
 	then
-		# Make sure there is no sudden changes to upstream rules file
+		gtkdocize --copy || die "gtkdocize failed"
+		eautoreconf
+	else
+		# Make sure there are 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/  -/}
@@ -149,13 +134,6 @@ src_prepare()
 			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
-	else
 		elibtoolize
 	fi
 }
@@ -164,12 +142,10 @@ src_configure()
 {
 	filter-flags -fprefetch-loop-arrays
 	econf \
-		--exec-prefix=/ \
+		--with-rootprefix=/ \
 		--libdir=/usr/$(get_libdir) \
-		--with-rootlibdir=/$(get_libdir) \
-		--libexecdir=/lib/udev \
-		--enable-logging \
-		--enable-static \
+		--libexecdir=/lib \
+		$(use_enable static-libs static) \
 		$(use_with selinux) \
 		$(use_enable debug) \
 		$(use_enable rule_generator) \
@@ -195,21 +171,15 @@ src_install()
 
 	if use keymap
 	then
-		dodoc extras/keymap/README.keymap.txt
+		dodoc src/extras/keymap/README.keymap.txt
 	fi
 
-	# compatibility symlinks:
-	# udevadm is now in /bin and udevd is in /lib/udev.
-	dosym "/bin/udevadm" /sbin/udevadm
-	dosym "/lib/udev/udevd" /sbin/udevd
+	# udevadm is now in /usr/bin.
+	dosym /usr/bin/udevadm /sbin/udevadm
 
 	# 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
+	dosym "/lib/udevd/scsi_id" /sbin/scsi_id
 
 	# Now install rules
 	insinto /lib/udev/rules.d/
@@ -222,16 +192,6 @@ src_install()
 	then
 		doins "rules/arch/40-${ARCH}.rules"
 	fi
-
-	cd "${WORKDIR}/${scriptname}"
-	doconfd conf.d/*
-	exeinto /lib/udev
-	doexe helpers/*
-	doinitd init.d/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /lib/udev/rules.d
-	doins rules.d/*
 }
 
 # 19 Nov 2008
@@ -270,8 +230,8 @@ restart_udevd()
 	# abort if there is no udevd running
 	[[ -n $(pidof udevd) ]] || return
 
-	# abort if no /dev/.udev exists
-	[[ -e /dev/.udev ]] || return
+	# abort if no /run/udev exists
+	[[ -e /run/udev ]] || return
 
 	elog
 	elog "restarting udevd now."
@@ -280,7 +240,7 @@ restart_udevd()
 	sleep 1
 	killall -9 udevd &>/dev/null
 
-	/sbin/udevd --daemon
+	/lib/udev/udevd --daemon
 	sleep 3
 	if [[ ! -n $(pidof udevd) ]]
 	then
@@ -292,64 +252,6 @@ restart_udevd()
 	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 /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
-}
-
 # This function determines if a directory is a mount point.
 # It was lifted from dracut.
 ismounted()
@@ -362,6 +264,7 @@ ismounted()
 
 pkg_postinst()
 {
+	mkdir -p "${ROOT}"/run
 	fix_old_persistent_net_rules
 
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
@@ -375,8 +278,6 @@ pkg_postinst()
 
 	restart_udevd
 
-	postinst_init_scripts
-
 	# people want reminders, I'll give them reminders.  Odds are they will
 	# just ignore them anyway...
 
@@ -418,7 +319,7 @@ pkg_postinst()
 
 	ewarn
 	ewarn "If you build an initramfs including udev, then please"
-	ewarn "make sure that the /sbin/udevadm binary gets included,"
+	ewarn "make sure that the /usr/bin/udevadm binary gets included,"
 	ewarn "and your scripts changed to use it,as it replaces the"
 	ewarn "old helper apps udevinfo, udevtrigger, ..."