rev bump to put /lib/udev back in /usr/lib/udev as well as add a second

compatibility patch so we can run helpers in /lib/udev.
Thanks to Egor Egorov for the patch.
I also spoke with the other udev maintainer (Samuli), and he agrees that
we should be using /usr/lib and allowing packages to put things in /lib
for now.
This is for bug #430412.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

4 files changed, 441 insertions, 14 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 6df7bbc2b0e3..bf54a33cf222 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,18 @@
 # 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.709 2012/08/08 07:55:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.710 2012/08/08 22:54:46 williamh Exp $
+
+*udev-187-r3 (08 Aug 2012)
+
+  08 Aug 2012; William Hubbs <williamh@gentoo.org> +udev-187-r3.ebuild,
+  udev-9999.ebuild:
+  rev bump to put /lib/udev back in /usr/lib/udev as well as add a second
+  compatibility patch so we can run helpers in /lib/udev.
+  Thanks to Egor Egorov for the patch.
+  I also spoke with the other udev maintainer (Samuli), and he agrees that
+  we should be using /usr/lib and allowing packages to put things in /lib
+  for now.
+  This is for bug #430412.
 
   08 Aug 2012; Justin Lecher <jlec@gentoo.org> udev-187-r1.ebuild,
   udev-187-r2.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 0ba683fc42cf..a14295a84d84 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -16,6 +16,7 @@ DIST udev-171-gentoo-patchset-v1.tar.bz2 796 SHA256 9524e64068d67bb55ddad16dd36a
 DIST udev-171-testsys.tar.bz2 155001 SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc SHA512 f3f537d771e36b87c71004f5576f7672ffeb815d0b5337bb6bbb6e842c32a28d1d92b4eb0ee2edc60c0b8bd576fc2f36e8b0ed16ec9c0cff9c216e04fb1438ad WHIRLPOOL 0ee66df2f52496d592d0dd3de7c628f6deee7f41c2d21e745f22d74e61c276e01cc6ba584c65b05d36c8a4fb14bc54e3e1a89b975751929b19e91458e3550253
 DIST udev-171.tar.bz2 597937 SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e SHA512 dea189d79b195f8c10740507b11de2c2074442301ee52a0b2c62efa8663e1793c1a78b03b95510ba19bc93d4dcc497120fbf6bb5784878aa903973f76b92d42f WHIRLPOOL a93241b0f0645696e6a88ddb152c3ef8f2c73b5bf3591892384f180fc7abeb580c59642013480546eac00ad5028b1900ad35b88f6a27ad2d07792e9f34e59743
 DIST udev-187-patches-1.tar.bz2 850 SHA256 3a2671966098f4e3401ab0c477d447ab14cebd1b95007e5fb9ed76a1236c7b1f SHA512 bc38c1e79572fc5d328c2f390c4d23446df6d1eaa2f23c15c44d764489d30fef95063b88a7ea2b6ae0f63808c2737b0997b27cd06aea32d35608cc895a385abe WHIRLPOOL e788646dea52233010379b66f70c2c9c712d5d0125708f93264b5445d7008cba862768d4dcd1dda63feaace7c973d8901a72c08445a889dff9e63c56911d1aa0
+DIST udev-187-patches-2.tar.bz2 1263 SHA256 a6e8d761ec75c20fec70f66a99ec64a2052f9820c6d380731df179dbfae02372 SHA512 7284bba48aad95aae1592920c03aec4768ca49c36b82fcda31037b5ece82f1a0030194a0380d6aeeee7b064c842808f0dcf80930f4e101c57f61dd2ee4988c0c WHIRLPOOL 926c609018387666a77f8c50caa30cbba24ce4d57d4dd2cf7936d5b6cb12b9584354f34ea1ff622bedfbf22790a636ae2fb4a9adb8fc4ca22977ffd8d4a3161d
 DIST udev-gentoo-legacy-patchset-1.tar.bz2 14039 SHA256 0a82fd7a6ed4212dc26d7b562d91e9bb7174581717683d447902f308110b635a SHA512 4a64d972ab361c781ebde7f9360d7842f8be2c945fbcf526019a49194197af9f2575e5ba399d7494c84b12489fe09333bf225f697b786fb6ccef7b287e58c9cc WHIRLPOOL 70e84987aa3c5ef93d624014bd13156a95d456ade17389b2a89261f57dee32d1dd7f416dd2397c4e6e2bbc09d0fee7acde8325bdf203021f45c49adf7c6e72ba
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef SHA512 ead3f34a906bd18a6895029f6d5f5a771fc237d437b621151d40142376ba6fa10e408a881c7dafcd308d5c5a66766ce9db8f612f0f78899362e8b30eda4aa0c5 WHIRLPOOL 4558a8d3073a7aa79d522e459f7c212b2a97f726f67a6f9665a3e9abd3dea6b2c888d52dd716de4b53628002af354fb5de41a83cdd71fdfc853e35978c6d5db6
 DIST udev-gentoo-scripts-7.tar.bz2 16248 SHA256 cef8d47fe3b023c40dde621e0c91a9d38b7e7b83de5bae53e71a9027dfc65de7 SHA512 16d37cb5f2289b789b569a799e62ab282f0667b1c47e54a325a310133212592a051242e137a02db928946278417a7745c5b17bb95d84f25ae071d71d5a4afd3b WHIRLPOOL 5b14aaad1a1771d02e3e6a78e6ecbc5122fbc48ac542f5dfc26539d2b1f64136de5633a2b9bd5bfce414fbffec12799a09bf2b29c375e033a4ea986ffc3ef878
@@ -27,15 +28,15 @@ EBUILD udev-164-r2.ebuild 15166 SHA256 0f9bcf6c0b6bdf72f0363e691653ca25b4b9c2f0d
 EBUILD udev-171-r6.ebuild 15730 SHA256 2eab4e525737c75f0c13828ff2b62c5cc4c826580151cbc5d2bca400821e43f5 SHA512 03f085f83ef0a9ce536e3a08539da81c3dfc51ba80de4e9b736e40bfa481fd635cd1176a8b1e1b01aaf8e2ddf53803dac5d6ab163f39a1828bd52fd85936312a WHIRLPOOL 2026eed2cb233176a188ad83d1639c1e80ac34ba5579564b1e97955d33828ffee80b95b302b3d41f755481162a6f44f7874e4d32d2cf13637bbccdafcad4115a
 EBUILD udev-187-r1.ebuild 10669 SHA256 518ddd29056aa472c95e717e27738c708df03cd086521207be7dd0684272cb53 SHA512 f38a584ecd4d1c18e814891374a5fd8ef9b11fbcb5ea1f8e2db10ff64656bc1c0b44bb72e653b55fc64884dfe7ad4a2027cc6ce9b733273be1ac4b926f809711 WHIRLPOOL 96c94db633cc7225943a82a52c8d4b238fedd00090b068ec2fe367c105dfba849302b1732eac467d27cf93b317a895592719673a666c26c5f7ef849ab6ff19cd
 EBUILD udev-187-r2.ebuild 9924 SHA256 e3cb2fe1220383d68e6c2d3f602cdd71e803708485748e33b1630b426d649d7a SHA512 93155d690d439815c602fb81e7900c27103946a7a7c6638afb36dd3d68c87b6cbcfeba31649026f94d66acc3aa99ce8b65a16a99c5eea3dd98d36081fe9119df WHIRLPOOL bfcf0a3b2b73da18a06dc23421281748e4a70859b67014b5b3b6cdbf444b930c8ef576d0849d5638cacdd40860b177fc510b0b2c1e6b3af070ff9b53491f4e20
-EBUILD udev-9999.ebuild 9924 SHA256 7da179bd9492392f2aa272fd95f67670c901ec785bd9f26e81289369a4390446 SHA512 117e551b38afe7724de3d2ad447f554663c8326ca81beec56e06dc9afdbcd6ae9fed856fadf50d55b0d765b2c0934ce2ce57a0f9ec0fd19f98624730029c4c90 WHIRLPOOL 8e7f3e490ceed880c133969c72bc4978d5dd6da3f9a7ee79842b2ffab6ee8bead9cd0c1479634e96159ac3ce1821e9a5144a6361c5cfee21a0a498c3a65a6eb7
-MISC ChangeLog 38657 SHA256 9e801a27829442865f96e72a4bc3a0e8751856ae4fa2bcc250370777055f9c87 SHA512 e339f0f5b38b65f151367140fab0725f38f42d8341ad0047d5242c8dc7710a18d60cce17a856904cc07202c66b7cb0e747a45ecb2f0ee234e1fa0b4b7e9bbc04 WHIRLPOOL bcc5878d7d8be104c408124d46f337a1be0454e8922f4b18fed9019a80646fe4c6f041629bab8c623bc6a5b589e42898fe22911156cf4676bfa22bab699f6495
+EBUILD udev-187-r3.ebuild 10353 SHA256 87494ed03e28626dd3b8a7df55405d7cfe1e5b4c40015a708f5b36ce6530607e SHA512 6ba8afeca1875d016aa9884dcfe07dc5514f0ee7f05b307b2aa27033d13077f64f714680846ff84985eb9a9ad01f91cb3791bf6bfdc10b21bd257309f159d46c WHIRLPOOL 5f92512062bd583e3fd39aa39ad21546ae2255d2346e91d92d90b4ef01e0538697d13de97debccbe89d7ab7329815ccdf73f63bc0501ef254f83791c3f5c0400
+EBUILD udev-9999.ebuild 10352 SHA256 224b6d65e06c806ac432f94a4acdabce450b02782c66d813ae5e3af9bea0f508 SHA512 1bb26178ca63a9977f6f41f92f72fc6b470478897c2d933166dd6dc39192086d67a7135814b8fb9dbdb4c35d49004780f915cd2b47bd101cf79c3c231f766c09 WHIRLPOOL 93666f7f151da61871ca6dfcd3ee3140ac16ddaf0a30fe44ae8ea49faba9be1a1bd265478e069ee8f6ed581f9d717a940ce51b35ad32aa43d6feb190587e7537
+MISC ChangeLog 39140 SHA256 aea5434db08ea253a3ac593e7b56beba7b253f45afb5710ff3a108e7b60970f4 SHA512 7c95e250287fef7c2fb0df956d2b4606971ab6055d5b5dffd95ea7ee5293efce7abd80609ead49f424bbe48c0d0d85d3be85d7faf3f90f1b469b23ebfdc416ef WHIRLPOOL 9fc6d8ae3e8e1c770c43a122ada7e7dce0b15a675305ff48894fcfaa2c590d2a55accc60e1c0c2e811567d5ed36938b70f5ef0f32fbcbb1ed5b5a06194e9ae51
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAiG1oACgkQgAnW8HDreRaN4QCfad0A6voD+BQz3AC3jLZSB1y6
-rx0AoJjAFhm8Og/hE75f+BVfgBXYBWl/
-=cQZU
+iEYEAREIAAYFAlAi7lsACgkQblQW9DDEZTgNeQCfdbwhMQz0Az7n7GZRwQ253quM
+SlUAnjg2Bfw/eEf5YShTD7hXgHQuFPS5
+=t052
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-187-r3.ebuild b/sys-fs/udev/udev-187-r3.ebuild
new file mode 100644
index 000000000000..e99a534d4514
--- /dev/null
+++ b/sys-fs/udev/udev-187-r3.ebuild
@@ -0,0 +1,403 @@
+# 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-187-r3.ebuild,v 1.1 2012/08/08 22:54:46 williamh Exp $
+
+EAPI=4
+
+KV_min=2.6.39
+
+inherit autotools eutils linux-info
+
+if [[ ${PV} = 9999* ]]
+then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
+	inherit git-2
+else
+	patchversion=2
+	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
+	if [[ -n "${patchversion}" ]]
+		then
+				SRC_URI="${SRC_URI}
+					mirror://gentoo/${P}-patches-${patchversion}.tar.bz2"
+			fi
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="doc gudev hwdb introspection keymap +openrc selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	selinux? ( sys-libs/libselinux )
+	>=sys-apps/kmod-5
+	>=sys-apps/util-linux-2.20
+	!<sys-libs/glibc-2.10"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+	virtual/os-headers
+	!<sys-kernel/linux-headers-${KV_min}
+	doc? ( dev-util/gtk-doc )"
+
+if [[ ${PV} = 9999* ]]
+then
+	DEPEND="${DEPEND}
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt"
+fi
+
+RDEPEND="${COMMON_DEPEND}
+	hwdb? ( sys-apps/hwids )
+	openrc? ( >=sys-fs/udev-init-scripts-16
+		!<sys-apps/openrc-0.9.9 )
+	!sys-apps/coldplug
+	!<sys-fs/lvm2-2.02.45
+	!sys-fs/device-mapper
+	!<sys-fs/udev-init-scripts-16
+	!<sys-kernel/dracut-017-r1
+	!<sys-kernel/genkernel-3.4.25"
+
+S="${WORKDIR}/systemd-${PV}"
+
+check_KV()
+{
+	if kernel_is lt ${KV_min//./ }
+	then
+		return 1
+	fi
+	return 0
+}
+
+check_default_rules()
+{
+	# Make sure there are no sudden changes to upstream rules file
+	# (more for my own needs than anything else ...)
+	local udev_rules_md5=18843fc4a8dd1d8074b98a583454cb9e
+	MD5=$(md5sum < "${S}/rules/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
+}
+
+pkg_setup()
+{
+	# required kernel options
+	CONFIG_CHECK="~DEVTMPFS"
+	ERROR_DEVTMPFS="DEVTMPFS is not set in this kernel. Udev will not run."
+
+	linux-info_pkg_setup
+
+	if ! check_KV
+	then
+		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+		eerror "It must be at least ${KV_min}!"
+	fi
+
+	KV_FULL_SRC=${KV_FULL}
+	get_running_version
+	if ! check_KV
+	then
+		eerror
+		eerror "Your running kernel version (${KV_FULL}) is too old"
+		eerror "for this version of udev."
+		eerror "You must upgrade your kernel or downgrade udev."
+	fi
+}
+
+src_prepare()
+{
+	# backport some patches
+	if [[ -n "${patchversion}" ]]
+	then
+		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 \
+	|| die "failed to change group dialout to uucp"
+
+	if [[ ! -e configure ]]
+	then
+		if use doc
+		then
+			gtkdocize --docdir docs || die "gtkdocize failed"
+		else
+			echo 'EXTRA_DIST =' > docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		check_default_rules
+		elibtoolize
+	fi
+}
+
+src_configure()
+{
+	local econf_args
+
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--docdir=/usr/share/doc/${PF}
+		--libdir=/usr/$(get_libdir)
+		--with-distro=gentoo
+		--with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware
+		--with-html-dir=/usr/share/doc/${PF}/html
+		--with-pci-ids-path=/usr/share/misc/pci.ids
+		--with-rootlibdir=/usr/$(get_libdir)
+		--with-rootprefix=/usr
+		--with-usb-ids-path=/usr/share/misc/usb.ids
+		--disable-acl
+		--disable-audit
+		--disable-coredump
+		--disable-hostnamed
+		--disable-ima
+		--disable-libcryptsetup
+		--disable-localed
+		--disable-logind
+		--disable-nls
+		--disable-pam
+		--disable-quotacheck
+		--disable-readahead
+		--enable-split-usr
+		--disable-tcpwrap
+		--disable-timedated
+		--disable-xz
+		$(use_enable doc gtk-doc)
+		$(use_enable gudev)
+		$(use_enable introspection)
+		$(use_enable keymap)
+		$(use_enable selinux)
+		$(use_enable static-libs static)
+	)
+	econf "${econf_args[@]}"
+}
+
+src_compile()
+{
+	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
+	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
+	local targets=(
+		systemd-udevd
+		udevadm
+		libudev.la
+		ata_id
+		cdrom_id
+		collect
+		scsi_id
+		v4l_id
+		accelerometer
+		mtd_probe
+		man/udev.7
+		man/udevadm.8
+		man/systemd-udevd.8
+		man/systemd-udevd.service.8
+	)
+	use keymap && targets+=( keymap )
+	use gudev && targets+=( libgudev-1.0.la )
+
+	emake "${targets[@]}"
+	if use doc
+	then
+		emake -C docs/libudev
+		use gudev && emake -C docs/gudev
+	fi
+}
+
+src_install()
+{
+	local lib_LTLIBRARIES=libudev.la \
+		pkgconfiglib_DATA=src/libudev/libudev.pc
+
+	local targets=(
+		install-libLTLIBRARIES
+		install-includeHEADERS
+		install-libgudev_includeHEADERS
+		install-binPROGRAMS
+		install-rootlibexecPROGRAMS
+		install-udevlibexecPROGRAMS
+		install-dist_udevconfDATA
+		install-dist_udevhomeSCRIPTS
+		install-dist_udevkeymapDATA
+		install-dist_udevkeymapforcerelDATA
+		install-dist_udevrulesDATA
+		install-girDATA
+		install-man7
+		install-man8
+		install-pkgconfiglibDATA
+		install-sharepkgconfigDATA
+		install-typelibsDATA
+		install-dist_docDATA
+		udev-confdirs
+	)
+
+	if use gudev
+	then
+		lib_LTLIBRARIES+=" libgudev-1.0.la"
+		pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
+	fi
+
+	# add final values of variables:
+	targets+=(
+		rootlibexec_PROGRAMS=systemd-udevd
+		bin_PROGRAMS=udevadm
+		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+		MANPAGES="man/udev.7 man/udevadm.8 man/systemd-udevd.service.8"
+		MANPAGES_ALIAS="man/systemd-udevd.8"
+		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+	)
+	emake DESTDIR="${D}" "${targets[@]}"
+	if use doc
+	then
+		emake -C docs/libudev DESTDIR="${D}" install
+		use gudev && emake -C docs/gudev DESTDIR="${D}" install
+	fi
+	dodoc TODO
+
+	prune_libtool_files --all
+	rm -f "${D}"/usr/lib/udev/rules.d/99-systemd.rules
+	rm -rf "${D}"/usr/share/doc/${PF}/LICENSE.*
+
+	# install gentoo-specific rules
+	insinto /usr/lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	# install udevadm symlink
+	dosym ../usr/bin/udevadm /sbin/udevadm
+}
+
+pkg_preinst()
+{
+	local htmldir
+	for htmldir in gudev libudev; do
+		if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]
+		then
+			rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir}
+		fi
+		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]
+		then
+			dosym ../../doc/${PF}/html/${htmldir} \
+				/usr/share/gtk-doc/html/${htmldir}
+		fi
+	done
+	preserve_old_lib /usr/$(get_libdir)/libudev.so.0
+}
+
+# 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
+
+	# "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
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	# 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
+
+	ewarn
+	ewarn "If you build an initramfs including udev, then please"
+	ewarn "make sure 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 "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"
+		ewarn
+		ewarn "For more information on setting up an initramfs, see the"
+		ewarn "following URL:"
+		ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
+	fi
+
+	ewarn
+	ewarn "The udev-acl functionality has been removed from standalone udev."
+	ewarn "If you are using standalone udev, consolekit handles this"
+	ewarn "functionality."
+
+	if [[ -d ${ROOT}lib/udev ]]
+	then
+		ewarn
+		ewarn "This version of udev moves the files that were installed in"
+		ewarn "/lib/udev to /usr/lib/udev."
+		ewarn "We include a backward compatibility patch for gentoo to"
+		ewarn "allow the rules in /lib/udev/rules.d to be read. However,"
+		ewarn "bugs should be filed against packages that are installing"
+	ewarn "files in /lib/udev so they can be fixed."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into affect."
+	ewarn "The method you use to do this depends on your init system."
+
+	ewarn
+	ewarn "Upstream has removed the persistent-net and persistent-cd rules"
+	ewarn "generator. If you need persistent names for these devices,"
+	ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d."
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libudev.so.0
+
+	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 fb0b38906478..31a042a87f15 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.106 2012/08/08 07:55:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.107 2012/08/08 22:54:46 williamh Exp $
 
 EAPI=4
 
@@ -56,12 +56,12 @@ fi
 
 RDEPEND="${COMMON_DEPEND}
 	hwdb? ( sys-apps/hwids )
-	openrc? ( >=sys-fs/udev-init-scripts-15
+	openrc? ( >=sys-fs/udev-init-scripts-16
 		!<sys-apps/openrc-0.9.9 )
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
-	!<sys-fs/udev-init-scripts-15
+	!<sys-fs/udev-init-scripts-16
 	!<sys-kernel/dracut-017-r1
 	!<sys-kernel/genkernel-3.4.25"
 
@@ -159,8 +159,8 @@ src_configure()
 		--with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware
 		--with-html-dir=/usr/share/doc/${PF}/html
 		--with-pci-ids-path=/usr/share/misc/pci.ids
-		--with-rootlibdir=/$(get_libdir)
-		--with-rootprefix=
+		--with-rootlibdir=/usr/$(get_libdir)
+		--with-rootprefix=/usr
 		--with-usb-ids-path=/usr/share/misc/usb.ids
 		--disable-acl
 		--disable-audit
@@ -270,11 +270,11 @@ src_install()
 	dodoc TODO
 
 	prune_libtool_files --all
-	rm -f "${D}"/lib/udev/rules.d/99-systemd.rules
+	rm -f "${D}"/usr/lib/udev/rules.d/99-systemd.rules
 	rm -rf "${D}"/usr/share/doc/${PF}/LICENSE.*
 
 	# install gentoo-specific rules
-	insinto /lib/udev/rules.d
+	insinto /usr/lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules
 
 	# install udevadm symlink
@@ -373,6 +373,17 @@ pkg_postinst()
 	ewarn "If you are using standalone udev, consolekit handles this"
 	ewarn "functionality."
 
+	if [[ -d ${ROOT}lib/udev ]]
+	then
+		ewarn
+		ewarn "This version of udev moves the files that were installed in"
+		ewarn "/lib/udev to /usr/lib/udev."
+		ewarn "We include a backward compatibility patch for gentoo to"
+		ewarn "allow the rules in /lib/udev/rules.d to be read. However,"
+		ewarn "bugs should be filed against packages that are installing"
+	ewarn "files in /lib/udev so they can be fixed."
+	fi
+
 	ewarn
 	ewarn "You need to restart udev as soon as possible to make the upgrade go"
 	ewarn "into affect."