diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2006-09-18 18:23:37 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2006-09-18 18:23:37 +0000 |
| commit | bbf7f6aeed34f6016bf408eba704f23812a7ba2d (patch) | |
| tree | 9d55f98afa195564ae4bd8985f317df882da52ba /sys-fs | |
| parent | Version bump, seemant said I could. Also add ~x86-fbsd keyword, and closes b... (diff) | |
| download | gentoo-2-bbf7f6aeed34f6016bf408eba704f23812a7ba2d.tar.gz gentoo-2-bbf7f6aeed34f6016bf408eba704f23812a7ba2d.tar.bz2 gentoo-2-bbf7f6aeed34f6016bf408eba704f23812a7ba2d.zip | |
Multilib fixes, don't install helper scripts in /get_libdir/udev and call them at /lib/udev in other scripts.
(Portage version: 2.1.1)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udev/udev-100-r2.ebuild | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 05e56a3e7934..1ec4343eefc1 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.214 2006/09/12 05:49:13 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.215 2006/09/18 18:23:37 herbs Exp $ + + 18 Sep 2006; Herbie Hopkins <herbs@gentoo.org> udev-100-r2.ebuild: + Multilib fixes, don't install helper scripts in /get_libdir/udev and call + them at /lib/udev in other scripts. 12 Sep 2006; Greg Kroah-Hartman <gregkh@gentoo.org> -udev-100-r1.ebuild: remove buggy 100-r1 ebuild diff --git a/sys-fs/udev/udev-100-r2.ebuild b/sys-fs/udev/udev-100-r2.ebuild index 5cd26981d202..c3b7a165a027 100644 --- a/sys-fs/udev/udev-100-r2.ebuild +++ b/sys-fs/udev/udev-100-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-100-r2.ebuild,v 1.1 2006/09/12 05:47:32 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-100-r2.ebuild,v 1.2 2006/09/18 18:23:37 herbs Exp $ inherit eutils flag-o-matic multilib @@ -96,7 +96,7 @@ src_install() { dosbin udev || die "Required binary not installed properly" # Helpers - exeinto /$(get_libdir)/udev + exeinto /lib/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" @@ -110,7 +110,7 @@ src_install() { doexe extras/rule_generator/write_cd_rules || die "Required helper not installed properly" doexe extras/rule_generator/write_net_rules || die "Required helper not installed properly" doexe extras/rule_generator/rule_generator.functions || die "Required helper not installed properly" - keepdir /$(get_libdir)/udev/state + keepdir /lib/udev/state # vol_id library (needed by mount and HAL) dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so* @@ -188,9 +188,9 @@ 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 + if [[ -d ${ROOT}/lib/udev-state ]] ; then + mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ + rm -r "${ROOT}"/lib/udev-state fi if [ -f "${ROOT}/etc/udev/udev.config" -a \ |