--- udev-182-r2.ebuild	2012-03-29 16:20:53.000000000 +0200
+++ -	2012-03-29 16:22:22.176496005 +0200
@@ -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-182-r2.ebuild,v 1.3 2012/03/28 21:54:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-182.ebuild,v 1.7 2012/03/22 15:25:22 williamh Exp $
 
 EAPI=4
 
@@ -29,15 +29,16 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build selinux debug +rule_generator hwdb gudev introspection
-	keymap floppy doc static-libs +openrc"
+IUSE="build selinux debug +rule_generator hwdb gudev introspection 
+	keymap floppy doc static-libs +openrc usr"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	gudev? ( dev-libs/glib:2 )
 	introspection? ( dev-libs/gobject-introspection )
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
-	>=sys-libs/glibc-2.10"
+	>=sys-libs/glibc-2.10
+	usr? ( sys-apps/kmod[usr] )"
 
 DEPEND="${COMMON_DEPEND}
 	keymap? ( dev-util/gperf )
@@ -60,14 +61,13 @@
 RDEPEND="${COMMON_DEPEND}
 	hwdb? (
 		>=sys-apps/usbutils-0.82
-		|| ( >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] )
+		|| ( >=sys-apps/pciutils-3.1.9-r1[-compress-db]  <sys-apps/pciutils-3.1.9-r1[-zlib] )
 		)
 	openrc? ( >=sys-fs/udev-init-scripts-10
 		!<sys-apps/openrc-0.9.9 )
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
-	!<sys-fs/udev-init-scripts-10
 	!<sys-kernel/dracut-017-r1
 	!<sys-kernel/genkernel-3.4.25"
 
@@ -141,15 +141,26 @@
 		fi
 		elibtoolize
 	fi
+	if use usr ; then
+		epatch "${FILESDIR}"/udev-182-separate_usr.patch
+	fi
 }
 
 src_configure()
 {
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir)"
+
+	if use usr ; then
+		myconf="--bindir=/bin --libdir=/lib"
+	fi
+
 	filter-flags -fprefetch-loop-arrays
 	econf \
 		--with-rootprefix=/ \
-		--libdir=/usr/$(get_libdir) \
 		--libexecdir=/lib \
+		$myconf \
+		$(use_enable introspection) \
 		$(use_enable static-libs static) \
 		$(use_with selinux) \
 		$(use_enable debug) \
@@ -157,7 +168,6 @@
 		--with-pci-ids-path=/usr/share/misc/pci.ids \
 		--with-usb-ids-path=/usr/share/misc/usb.ids \
 		$(use_enable gudev) \
-		$(use_enable introspection) \
 		$(use_enable keymap) \
 		$(use_enable floppy) \
 		$(use_enable doc gtk-doc) \
@@ -175,32 +185,25 @@
 	dodoc ChangeLog NEWS README TODO
 	use keymap && dodoc src/keymap/README.keymap.txt
 
+	local htmldir
+	for htmldir in gudev libudev; do
+		[[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]] &&
+			dosym /usr/share/doc/${PF}/html/${htmldir} \
+				/usr/share/gtk-doc/html/${htmldir}
+	done
+
 	# 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
+	dosym /lib/udevd/scsi_id /sbin/scsi_id
 
 	# Now install rules
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules
 }
 
-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 /usr/share/doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
 # 19 Nov 2008
 fix_old_persistent_net_rules()
 {