Index: udev-096-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-096-r1.ebuild,v
retrieving revision 1.2
diff -u -p -r1.2 udev-096-r1.ebuild
--- udev-096-r1.ebuild	19 Jul 2006 17:13:39 -0000	1.2
+++ udev-096-r1.ebuild	27 Aug 2006 20:58:56 -0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-096-r1.ebuild,v 1.2 2006/07/19 17:13:39 azarah Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -94,7 +94,7 @@ src_install() {
 	dosbin udevcontrol	|| die "Required binary not installed properly"
 	dosbin udevsettle	|| die "Required binary not installed properly"
 	# Helpers
-	exeinto /lib/udev
+	exeinto /$(get_libdir)/udev
 	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
 	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
 	doexe extras/ata_id/ata_id		|| die "Required helper not installed properly"
@@ -105,6 +105,7 @@ src_install() {
 	doexe extras/cdrom_id/cdrom_id	|| die "Required helper not installed properly"
 	doexe extras/dasd_id/dasd_id	|| die "Required helper not installed properly"
 	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
+	keepdir /$(get_libdir)/udev/state
 
 	# vol_id library (needed by mount and HAL)
 	dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
@@ -174,6 +175,11 @@ src_install() {
 }
 
 pkg_preinst() {
+	if [[ -d ${ROOT}/$(get_libdir)/udev-state ]] ; then
+		mv -f "${ROOT}"/$(get_libdir)/udev-state/* "${D}"/$(get_libdir)/udev/state/
+		rm -r "${ROOT}"/$(get_libdir)/udev-state
+	fi
+
 	if [ -f "${ROOT}/etc/udev/udev.config" -a \
 	     ! -f "${ROOT}/etc/udev/udev.rules" ]
 	then
Index: files/udev-start-096.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-start-096.sh,v
retrieving revision 1.1
diff -u -p -r1.1 udev-start-096.sh
--- files/udev-start-096.sh	15 Jul 2006 17:16:52 -0000	1.1
+++ files/udev-start-096.sh	27 Aug 2006 20:58:56 -0000
@@ -94,9 +94,9 @@ main() {
 
 	# Actually get udev rolling
 	if [[ ${RC_DEVICE_TARBALL} == "yes" && \
-	      -s /lib/udev-state/devices.tar.bz2 ]] ; then
+	      -s /lib/udev/state/devices.tar.bz2 ]] ; then
 		ebegin "Populating /dev with saved device nodes"
-		try tar -jxpf /lib/udev-state/devices.tar.bz2 -C /dev
+		try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev
 		eend $?
 	fi