diff options
| -rw-r--r-- | sys-fs/udev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udev/udev-115.ebuild | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 031674a2a527..71074fff273e 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.340 2007/08/30 08:28:35 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.341 2007/09/02 09:53:03 zzam Exp $ + + 02 Sep 2007; Matthias Schwarzott <zzam@gentoo.org> udev-115.ebuild: + Cleaning up libvolume_id installation. Now die if dolib fails to prevent + broken udev installs, bug 190994. 30 Aug 2007; Matthias Schwarzott <zzam@gentoo.org> udev-114-r2.ebuild: Backported fix to kernel version check by Polynomial-C diff --git a/sys-fs/udev/udev-115.ebuild b/sys-fs/udev/udev-115.ebuild index 8945aae203b6..248729d2f531 100644 --- a/sys-fs/udev/udev-115.ebuild +++ b/sys-fs/udev/udev-115.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115.ebuild,v 1.3 2007/08/26 21:06:11 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115.ebuild,v 1.4 2007/09/02 09:53:03 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs versionator @@ -149,9 +149,10 @@ src_install() { # vol_id library (needed by mount and HAL) into / - dolib extras/volume_id/lib/*.so* + rm ${D}/lib/libvolume_id.so* 2>/dev/null + dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so" into /usr - dolib extras/volume_id/lib/*.a + dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a" # handle static linking bug #4411 rm -f "${D}/usr/$(get_libdir)/libvolume_id.so" @@ -273,7 +274,7 @@ pkg_postinst() { # Removing some old file if has_version "<sys-fs/udev-104-r5"; then rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null fi if has_version "<sys-fs/udev-106-r5"; then @@ -284,7 +285,7 @@ pkg_postinst() { # Try to remove /etc/dev.d as that is obsolete if [[ -d "${ROOT}"/etc/dev.d ]]; then - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null if [[ -d "${ROOT}"/etc/dev.d ]]; then ewarn "You still have the directory /etc/dev.d on your system." ewarn "This is no longer used by udev and can be removed." |