udev-state.patch

   1 Index: udev-096-r1.ebuild
   2 ===================================================================
   3 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-096-r1.ebuild,v
   4 retrieving revision 1.2
   5 diff -u -p -r1.2 udev-096-r1.ebuild
   6 --- udev-096-r1.ebuild  19 Jul 2006 17:13:39 -0000      1.2
   7 +++ udev-096-r1.ebuild  27 Aug 2006 20:58:56 -0000
   8 @@ -2,7 +2,7 @@
   9  # Distributed under the terms of the GNU General Public License v2
  10  # $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-096-r1.ebuild,v 1.2 2006/07/19 17:13:39 azarah Exp $
  11
  12 -inherit eutils flag-o-matic
  13 +inherit eutils flag-o-matic multilib
  14
  15  DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
  16  HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
  17 @@ -94,7 +94,7 @@ src_install() {
  18         dosbin udevcontrol      || die "Required binary not installed properly"
  19         dosbin udevsettle       || die "Required binary not installed properly"
  20         # Helpers
  21 -       exeinto /lib/udev
  22 +       exeinto /$(get_libdir)/udev
  23         doexe extras/run_directory/udev_run_devd        || die "Required helper not installed properly"
  24         doexe extras/run_directory/udev_run_hotplugd    || die "Required helper not installed properly"
  25         doexe extras/ata_id/ata_id              || die "Required helper not installed properly"
  26 @@ -105,6 +105,7 @@ src_install() {
  27         doexe extras/cdrom_id/cdrom_id  || die "Required helper not installed properly"
  28         doexe extras/dasd_id/dasd_id    || die "Required helper not installed properly"
  29         doexe extras/edd_id/edd_id              || die "Required helper not installed properly"
  30 +       keepdir /$(get_libdir)/udev/state
  31
  32         # vol_id library (needed by mount and HAL)
  33         dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
  34 @@ -174,6 +175,11 @@ src_install() {
  35  }
  36
  37  pkg_preinst() {
  38 +       if [[ -d ${ROOT}/$(get_libdir)/udev-state ]] ; then
  39 +               mv -f "${ROOT}"/$(get_libdir)/udev-state/* "${D}"/$(get_libdir)/udev/state/
  40 +               rm -r "${ROOT}"/$(get_libdir)/udev-state
  41 +       fi
  42 +
  43         if [ -f "${ROOT}/etc/udev/udev.config" -a \
  44              ! -f "${ROOT}/etc/udev/udev.rules" ]
  45         then
  46 Index: files/udev-start-096.sh
  47 ===================================================================
  48 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-start-096.sh,v
  49 retrieving revision 1.1
  50 diff -u -p -r1.1 udev-start-096.sh
  51 --- files/udev-start-096.sh     15 Jul 2006 17:16:52 -0000      1.1
  52 +++ files/udev-start-096.sh     27 Aug 2006 20:58:56 -0000
  53 @@ -94,9 +94,9 @@ main() {
  54
  55         # Actually get udev rolling
  56         if [[ ${RC_DEVICE_TARBALL} == "yes" && \
  57 -             -s /lib/udev-state/devices.tar.bz2 ]] ; then
  58 +             -s /lib/udev/state/devices.tar.bz2 ]] ; then
  59                 ebegin "Populating /dev with saved device nodes"
  60 -               try tar -jxpf /lib/udev-state/devices.tar.bz2 -C /dev
  61 +               try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev
  62                 eend $?
  63         fi
  64