Also doing lib install cleanup for stable version.

Package-Manager: portage-2.1.3.7

3 files changed, 25 insertions, 17 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 71074fff273e..ba3592841a72 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # 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.341 2007/09/02 09:53:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.342 2007/09/02 10:25:23 zzam Exp $
+
+  02 Sep 2007; Matthias Schwarzott <zzam@gentoo.org> udev-114.ebuild:
+  Also doing lib install cleanup for stable version.
 
   02 Sep 2007; Matthias Schwarzott <zzam@gentoo.org> udev-115.ebuild:
   Cleaning up libvolume_id installation. Now die if dolib fails to prevent
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 41abe1076abe..cbc58488e7b4 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -227,22 +227,26 @@ EBUILD udev-114-r2.ebuild 9293 RMD160 b0c1c530613b442b9935791c116ed1c227cec7d9 S
 MD5 99ae92e2efd80a25b11a5568e4155a20 udev-114-r2.ebuild 9293
 RMD160 b0c1c530613b442b9935791c116ed1c227cec7d9 udev-114-r2.ebuild 9293
 SHA256 20e35e45c79cc269c3de96f46c4d2f46f84995457b232b9f957b346eaa447da2 udev-114-r2.ebuild 9293
-EBUILD udev-114.ebuild 8563 RMD160 a4e60beb2e6c406bb91209ba8ade76fcf4e59665 SHA1 a79b046af1d4a45728be0b406599f4971d7de892 SHA256 f0366c8921efe9a66d8636b594cf450e075af40436ae5da522a127d1f820d6aa
-MD5 0f2a0f88939de1d629c400117a7acabf udev-114.ebuild 8563
-RMD160 a4e60beb2e6c406bb91209ba8ade76fcf4e59665 udev-114.ebuild 8563
-SHA256 f0366c8921efe9a66d8636b594cf450e075af40436ae5da522a127d1f820d6aa udev-114.ebuild 8563
+EBUILD udev-114.ebuild 8712 RMD160 beefa231c2734bec46bd458b07e4e8adf65c7fa1 SHA1 b37a2ecadc9c7bd47b94df75c5f2d7d962ba738b SHA256 cad6417ee85cfa57d39cd221def6f1ce6d9c896cc653bc76c9096fbe1b8bc69d
+MD5 c9cde39d94b4e01add085db8b7218a26 udev-114.ebuild 8712
+RMD160 beefa231c2734bec46bd458b07e4e8adf65c7fa1 udev-114.ebuild 8712
+SHA256 cad6417ee85cfa57d39cd221def6f1ce6d9c896cc653bc76c9096fbe1b8bc69d udev-114.ebuild 8712
 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 ChangeLog 68504 RMD160 1fd5bc306c1fb9b9e77fcd0282bfdbdb16c968c5 SHA1 498a94482f95fee5e7c4703bf2c08b23966fb80e SHA256 7fa6b4411d51a86151471b05af9ddae489c9c063be5846540b181aea6808dc86
+MD5 e6d5fbc663ac9690347f488f3804194e ChangeLog 68504
+RMD160 1fd5bc306c1fb9b9e77fcd0282bfdbdb16c968c5 ChangeLog 68504
+SHA256 7fa6b4411d51a86151471b05af9ddae489c9c063be5846540b181aea6808dc86 ChangeLog 68504
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
 SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 metadata.xml 447
+MISC udev-114.ebuild.orig 8563 RMD160 a4e60beb2e6c406bb91209ba8ade76fcf4e59665 SHA1 a79b046af1d4a45728be0b406599f4971d7de892 SHA256 f0366c8921efe9a66d8636b594cf450e075af40436ae5da522a127d1f820d6aa
+MD5 0f2a0f88939de1d629c400117a7acabf udev-114.ebuild.orig 8563
+RMD160 a4e60beb2e6c406bb91209ba8ade76fcf4e59665 udev-114.ebuild.orig 8563
+SHA256 f0366c8921efe9a66d8636b594cf450e075af40436ae5da522a127d1f820d6aa udev-114.ebuild.orig 8563
 MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r12 229
 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r12 229
 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r12 229
@@ -288,7 +292,7 @@ SHA256 577c5bf89f320d4cde77951dbd0d32f6cd05c09eb13d153c0dda20cc1a3a135e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG2ogJt2vP6XvVdOcRAkSAAJ9JJwh/7rKLjFIsbPN0eJhtyJTHPwCfSQ32
-wv0IuxtP02+jxdF6nctyGvQ=
-=EwMS
+iD8DBQFG2o+at2vP6XvVdOcRAl9EAJ93vrkNWq9HXGTklKeL7ywB6T7dQgCgjg/g
+4GAYXHWpdgjXn5FfeqyI3BU=
+=UrAE
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-114.ebuild b/sys-fs/udev/udev-114.ebuild
index 8044a04486c6..73b377eaa463 100644
--- a/sys-fs/udev/udev-114.ebuild
+++ b/sys-fs/udev/udev-114.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-114.ebuild,v 1.11 2007/08/25 14:43:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114.ebuild,v 1.12 2007/09/02 10:25:23 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -126,9 +126,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"
@@ -247,7 +248,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
@@ -258,7 +259,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."