--- /var/lib/layman/udev/sys-fs/udev/udev-9999.ebuild	2012-10-03 16:25:07.086288902 +0200
+++ udev-9999.ebuild	2012-10-10 20:39:20.969003518 +0200
@@ -7,8 +7,8 @@
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://bitbucket.org/braindamaged/udev.git"
 	EGIT_HAS_SUBMODULES="0"
-	
-	inherit git-2 
+
+	inherit git-2
 else
 	SRC_URI="https://bitbucket.org/braindamaged/udev/downloads/udev-${PV}.tar.gz"
 fi
@@ -21,7 +21,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc debug gudev hwdb introspection keymap floppy +openrc selinux static-libs"
+IUSE="doc debug gudev hwdb introspection keymap floppy +openrc selinux static-libs +rootfs-install"
 
 RESTRICT="test"
 
@@ -98,17 +98,20 @@
 			eerror "You need at least ${KV_MIN}."
 			;;
 	esac
-	
+
 	echo
 	check_extra_config
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}"-keyboard-force-release.sh.patch
+	epatch "${FILESDIR}/${P}"-streq.patch
+
 	# Change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/g' \
 		-i rules/*.rules \
 		|| die "failed to change group dialout to uucp"
-	
+
 	if [[ ${PV} == "9999" ]]; then
 		if [[ ! -e configure ]]; then
 			eautoreconf
@@ -120,19 +123,34 @@
 }
 
 src_configure() {
+	if use rootfs-install; then
+		myconf="${myconf}
+				--prefix="${EPREFIX}"
+				--bindir="${EPREFIX}"/sbin
+				--libexecdir="${EPREFIX}"/"$(get_libdir)"
+				--exec-prefix=${EPREFIX}/
+				--with-rootprefix="${EPREFIX}"/$(get_libdir)
+				--libdir=${EPREFIX}/usr/$(get_libdir) "
+	else
+		myconf="${myconf}
+				--prefix="${EPREFIX}/usr"
+				--bindir="${EPREFIX}"/usr/sbin
+				--libexecdir="${EPREFIX}"/usr/"$(get_libdir)"
+				--exec-prefix=${EPREFIX}/usr
+				--with-rootprefix="${EPREFIX}"/usr/$(get_libdir)
+				--libdir=${EPREFIX}/usr/$(get_libdir) "
+	fi
+
 	econf \
-		--prefix="${EPREFIX}" \
-		--with-rootprefix="${EPREFIX}" \
-		--bindir="${EPREFIX}"/sbin \
+		${myconf} \
+		--with-distro=gentoo \
+		--with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware \
 		--sysconfdir="${EPREFIX}"/etc \
-		--libexecdir="${EPREFIX}"/"$(get_libdir)" \
-		--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
-		--with-rootlibdir="${EPREFIX}"/"$(get_libdir)" \
 		--includedir="${EPREFIX}"/usr/include \
 		--datarootdir="${EPREFIX}"/usr/share \
 		--docdir="${EPREFIX}"/usr/share/doc/"${PF}" \
-		--with-pci-ids-path="${EPREFIX}"/usr/share/misc/pci.ids \
-		--with-usb-ids-path="${EPREFIX}"/usr/share/misc/usb.ids \
+		--with-pci-ids-path="${EPREFIX}"/etc/hwids/pci.ids \
+		--with-usb-ids-path="${EPREFIX}"/etc/hwids/usb.ids \
 		--enable-logging \
 		$(use_with selinux) \
 		$(use_enable debug) \
@@ -145,10 +163,13 @@
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	
+	emake DESTDIR="${ED}" install
+
+	prune_libtool_files --all
+	gen_usr_ldscript -a udev
+
 	# Install documentation
-	dodoc COPYING README INSTALL 
+	dodoc COPYING README INSTALL
 
 	# Install gentoo-specific rules
 	insinto /"$(get_libdir)"/udev/rules.d
@@ -157,7 +178,7 @@
 
 pkg_postinst() {
 	# Create rundir for udev
-	mkdir -p "${ROOT}"/run
+	mkdir -p "${EROOT}"/run
 
 	ewarn "libudev version may be updated, please consider running"
 	ewarn "revdep-rebuild."