Cleaning up libvolume_id installation. Now die if dolib fails to prevent broken udev installs, bug 190994.

Package-Manager: portage-2.1.3.7

3 files changed, 22 insertions, 17 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/Manifest b/sys-fs/udev/Manifest
index 48407f028f90..41abe1076abe 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -231,14 +231,14 @@ EBUILD udev-114.ebuild 8563 RMD160 a4e60beb2e6c406bb91209ba8ade76fcf4e59665 SHA1
 MD5 0f2a0f88939de1d629c400117a7acabf udev-114.ebuild 8563
 RMD160 a4e60beb2e6c406bb91209ba8ade76fcf4e59665 udev-114.ebuild 8563
 SHA256 f0366c8921efe9a66d8636b594cf450e075af40436ae5da522a127d1f820d6aa udev-114.ebuild 8563
-EBUILD udev-115.ebuild 9246 RMD160 c2d064176d6082c07846a61d168ad0efabb8d30f SHA1 ab588e6ad40650d432b675d254f7f116449b9777 SHA256 769a1c8680974274ed54f4e4892407d4d9f615cea00c3f51f1bd5dc47e36becc
-MD5 c2a7608d4097b48194e34ff1546f6121 udev-115.ebuild 9246
-RMD160 c2d064176d6082c07846a61d168ad0efabb8d30f udev-115.ebuild 9246
-SHA256 769a1c8680974274ed54f4e4892407d4d9f615cea00c3f51f1bd5dc47e36becc udev-115.ebuild 9246
-MISC ChangeLog 68198 RMD160 f840369d230a1b62241aa589f93fe2e01c50c8f8 SHA1 b6cdf278816b75953b8ede3b6987f5aee12095d5 SHA256 a93cd5d46adb62bf19f56f4e2cdcbcac2fedd060a07696aea3ec6fedbcb7f08d
-MD5 9b837eff6ea6cb5373d8617379348df2 ChangeLog 68198
-RMD160 f840369d230a1b62241aa589f93fe2e01c50c8f8 ChangeLog 68198
-SHA256 a93cd5d46adb62bf19f56f4e2cdcbcac2fedd060a07696aea3ec6fedbcb7f08d ChangeLog 68198
+EBUILD udev-115.ebuild 9397 RMD160 438146ad600afd5d9c9d446155ae90d60d0d5d90 SHA1 23e5686dbcfe0505d9cf0a1c6f92fa45f3d7af01 SHA256 26699464a00b42158f6220e9a8bebcfbe4325a2480194b55784f87450063cfa2
+MD5 d85326e1bde18d2f22d2d3f9d554c88c udev-115.ebuild 9397
+RMD160 438146ad600afd5d9c9d446155ae90d60d0d5d90 udev-115.ebuild 9397
+SHA256 26699464a00b42158f6220e9a8bebcfbe4325a2480194b55784f87450063cfa2 udev-115.ebuild 9397
+MISC ChangeLog 68380 RMD160 6d1da3e1a8cd3ef16a736e6f829832b466651589 SHA1 8a12cfe92a9002f0c2c2f5415889bb6581ce3303 SHA256 f621e0080c0e3657448cc463b6ed1dd905f9f2c614f89b799177624b2f22137e
+MD5 6a5d0cde1c561ac6344cee897336fda1 ChangeLog 68380
+RMD160 6d1da3e1a8cd3ef16a736e6f829832b466651589 ChangeLog 68380
+SHA256 f621e0080c0e3657448cc463b6ed1dd905f9f2c614f89b799177624b2f22137e ChangeLog 68380
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -288,7 +288,7 @@ SHA256 577c5bf89f320d4cde77951dbd0d32f6cd05c09eb13d153c0dda20cc1a3a135e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG1oCgt2vP6XvVdOcRAngNAJ42gXLQuXjVC1RHDcNDTYaN5ZhQuwCfab3i
-KZm7rnDHpEVUvWvOyAWGpEA=
-=BVex
+iD8DBQFG2ogJt2vP6XvVdOcRAkSAAJ9JJwh/7rKLjFIsbPN0eJhtyJTHPwCfSQ32
+wv0IuxtP02+jxdF6nctyGvQ=
+=EwMS
 -----END PGP SIGNATURE-----
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."