Since libudev.so.0 was in /usr for a while; adjust the preserve_old_lib command by Zero_Chaos

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 26 insertions, 21 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index b7026a1d7cd7..a2f9d527ee0b 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.802 2013/01/24 10:36:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.803 2013/01/27 06:10:29 ssuominen Exp $
+
+  27 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
+  udev-197-r4.ebuild, udev-9999.ebuild:
+  Since libudev.so.0 was in /usr for a while; adjust the preserve_old_lib
+  command by Zero_Chaos
 
   24 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 1e565ac1e578..4e4b2ec99519 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,20 +11,20 @@ DIST udev-197-patches-1.tar.bz2 1344 SHA256 563479e8860ba6d67366f40d9e58b85e31f9
 DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903b0e05a8cc9f44a612a8038abd05f37b342f7e235 SHA512 b18ccdbb4373021ee9f32b4e10dc1b846b64a1222d4a556370ee78efac530d7a868c8924d449a2d503ee12667e603c50514e3f3c4fc08b608a9676574587f073 WHIRLPOOL 765c6f411a793bcdd9d452c7f36719b1d0dd741b3d6da0446fa459d2a0207220d609a0a3ef500411faf7e308ddf315f27a19e179cb7f54bee52ef3f033773a3a
 DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
 EBUILD udev-171-r10.ebuild 16106 SHA256 c9e107c27107cfe9c9e3cba319d7280b4510f0b466222354f45c6c8664b48371 SHA512 79a62ae8e519a7cf2e0e78f5d87d7d046ef14ea0571bf20e51b1121927e40b67069291ed050610541422c47535c1d85b6f2f3001078fe2f73d89878fdd3782a3 WHIRLPOOL 770759c3c24ed66d0ebda92517a096f91f4d644af276116f21c4acb9625644e33f9441927fe75167786df2e6400635622670e7a5cb6056f5311222537982f065
-EBUILD udev-197-r3.ebuild 13735 SHA256 ac61acb109e7424cf85e152d6360e84482086e8ba12fbe05742a298b17056246 SHA512 e875d392b0c0ad37df7bd626a9cfe3290f2c11a4e1fc627d45b43fe88b4850f39c9d1c7b6eabe843bb8e1e3114b0c48886e09c5a7663009a87e3a2369a0291c1 WHIRLPOOL b59be076b0aa81395836256be44327e50bf75dbde789068862671c55d35c461cd9faa433bacbb616ab1eeaf1658b55461669d5d9b6154dc97394f1c7b0b91943
-EBUILD udev-197-r4.ebuild 14638 SHA256 d6dee18070f4ecabc2890163171b449a5b54f0a1bfdaa29fa7717d3f688ab8b8 SHA512 4b794bb03a282534824fcdf403841a869c8798a270ae93f47936dfbb0960991d2f0e963f5d943e8f42dfeeb21cae6056424f0d02da5b7d831ddab11f081c888a WHIRLPOOL 7c4756ee7a00635e428d0d18fa9fb3fbebbc0895280e1fdf1516864bc48238c2e602736106dc1a74c3c0c643d8d6679117fc5a02fe5026c96c80647131ae4213
-EBUILD udev-9999.ebuild 14636 SHA256 bea4d36aca9637da4f7c0fa65df4ea993a4fd5e0cff5ac32fdbfb6d65b9f68e8 SHA512 805f3929848b341162e1c177289e52b2149431577f46ab551a57b5a6f49897d7aa4d8dd8aac16760778b06c46df0c810a4af866fe0a5de0a92dcaf02bdf6c5f4 WHIRLPOOL 9c1100fd41a3d2267e1754cbf898a792b038ac0f3c297b6df4bb47cff68b3fd4cf72de46483ad172eb225adc1848e06eca14eb6e30bbe7f114e1bf8b61992c04
-MISC ChangeLog 53031 SHA256 0475851de4e04f3063de8b52c7b68574e65bde3429fd4a8e895df42170baca5f SHA512 5d1e19785ed9cfe1f0fc7212e23ca6ff65e8fc54880b8732a6aeb6be0863dd01a7ef0a8b864433e6f3684b221545b6be0c138338129beb48d4fd890b2e509224 WHIRLPOOL c59375263fbd4014eb2e4ca9f107e000f1329adfea920f0c0a48b64f833b0b278bf00165f1636be5cce1dacd78eb9c3014a0fa97d6e126b50e7c1c712e3bcc90
+EBUILD udev-197-r3.ebuild 13771 SHA256 221625ab6895d34ba2dac0999056420b44e64b7f11ba5e983728d98dc6eb5db3 SHA512 67835f33a7a641405e80fdfbc6fd0dd20393be4aa6a669e4d1f775a52c832410af48ed55c9eabcf7f2f8026fc5ff9b3866119e4e89e8bdc57aea904f32e9c09c WHIRLPOOL 4361d3b70890406077d6cd2437ccfc49e5e9894600ae518297badac43060eb70c5efb157233040d3c38e5db9dd0e7cd8370888dab5a4542e194eaf059a2e1712
+EBUILD udev-197-r4.ebuild 14674 SHA256 a15f683553d0abf43d49099289e838d96a4d16f9b828d3340b52d21f0df32c02 SHA512 3d24e0843e5f44f5eb102b153696d0014bf44c18e8d4453ed1e7a683cbdba0217f23263e2a9efd3a2048a2908ddd4ed09a5d5fa3921ed60bc91586d26c779902 WHIRLPOOL 9a8bc9d36ee2059ff0375b3d70a5929ecf4dec96d6ca5ab423eacbceae3d34e583dabd5ff3d18cd581cf64ba00b89be6e015fd670a5de3b959decddff7db7e84
+EBUILD udev-9999.ebuild 14672 SHA256 f60cb5945d5fc15a50c4d1d5bce4115daa8cd8ea04c9f7f68ac9fea5c9dbfd09 SHA512 f0690248f930b4b161b97190354bdc035fe9730921e7534eac3429b955431535be19de627b8cf0247b4dd3901c647afdc302cd6fcb19b05d75d155c6ffba22b6 WHIRLPOOL 2dd8579d1ee39d21330f863737512b713c9c3ff9421f49bb7cad57941bddbb11a1f7b552493699fedb162884849bd8d1ae7712a715a647bd1a5abf33ae4da07f
+MISC ChangeLog 53244 SHA256 e0dfe19a7897f32b1f14d004c2765cec4643a66ee37cf1a16049d0e5191b994d SHA512 08ce43b3367e1ee6cda07ac0de94a2090e65fc18439dc8b51971ab5fa031cf917f659cb68721cc836e03ef65e64398182e85e58346bfeaac3986a141ad0fa345 WHIRLPOOL 2d5b5950acf404fd3c05667008f4f2ba65185e5f090946424f2394caf79e66ce1c5bb310abccd2e4f2ce259fb09cabe2c352211b21b726e7cc133926eb5efdce
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1098 SHA256 69d8c28e0c2439c252068ae2e0141a9bad7b05e65b9dec27aa2dd3feb4f2393c SHA512 87354f467c3f2ed005a10652a2f80ffda010fbc0c6fb88436b906c92f4cf1543ed1a6cf4a49c93f15c6fea3ba0dcd108e1e120954f7b0860e7ac90072d2b3d67 WHIRLPOOL 9c01df67041d2093e5a2ee4a9ad65df613cdcb163bc366c8592e8e2be84b176da13198261a012687188918c906291d765856665806efe03b8dfb22a5b4eb6834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAQ6dAAoJEEdUh39IaPFN4/QH/i+HPoz0bcH7wdicGOaTTVok
-WPHE+mvy+gg0yXC+G2F7nzN/zUoZZAmfLe9AzjPdZSH67lxX8jimneNBgtln96uL
-0MmY3sNmUYEUVoZr5NhT3r2ApKFewA9h2yKv02wg6dh7wAFwcMMS2p41BUhyS0BG
-60kEKAnb99WQ/8aKOrLKn2RQ/kxURG4tKqnKmFBvT2xZx2GXDpb18T+FCsOBGnho
-7YiT4I91yhYjxiRGaNDcso/tiKVUHn8Akmvpcx0Guczj3dAJO/XIRiGjH+1blQ0Q
-3P3E+o8NHptthZ6XzGWHe+Ej2L+ONJHKNgxapnHmvcjQdlo0jwRmGgtD0IhYPck=
-=HN2R
+iQEcBAEBCAAGBQJRBMS6AAoJEEdUh39IaPFN5/4IAIah/q3qSyZ6o1mxOwMDAYp0
+P2gknd0Q6tns5Of65WHmbVLwDGgJutLYkCVTxlJcRxH6/J5AJhqfAVo5mkXH3IuD
+af4DO9Ex6jtvIhUBU1CKvdDYYWI0ttlbiP0eEOtEoHpZIBqqS8jsUG2jUwtWqKeG
+eyhgd9vTQL7tpqS5bbZLTxnkMjfRlmYO1FrjVh4aTbjPj0ykCjc68ayitu3pX7KH
+J0kEJEVQfiJu0T38aM3SNp2ywaG4UDqCgwD0z9rpb9sqL8c95dD1aOnDIi5QcBPC
+1UaWfZWgp+uaIwx1WdAD2p8fWEJcRhu+53h9FUA+Fauw2MkMr6pRt2RJoIxFfd0=
+=kXS9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-197-r3.ebuild b/sys-fs/udev/udev-197-r3.ebuild
index ea11285eabb8..0024afc4d91a 100644
--- a/sys-fs/udev/udev-197-r3.ebuild
+++ b/sys-fs/udev/udev-197-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.28 2013/01/23 20:41:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.29 2013/01/27 06:10:29 ssuominen Exp $
 
 EAPI=4
 
@@ -366,7 +366,7 @@ pkg_preinst()
 				/usr/share/gtk-doc/html/${htmldir}
 		fi
 	done
-	preserve_old_lib /$(get_libdir)/libudev.so.0
+	preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
 }
 
 # This function determines if a directory is a mount point.
@@ -480,7 +480,7 @@ pkg_postinst()
 	ewarn "The method you use to do this depends on your init system."
 	ewarn
 
-	preserve_old_lib_notify /$(get_libdir)/libudev.so.0
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
 
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
diff --git a/sys-fs/udev/udev-197-r4.ebuild b/sys-fs/udev/udev-197-r4.ebuild
index d4cabfc921f2..abcea4174fce 100644
--- a/sys-fs/udev/udev-197-r4.ebuild
+++ b/sys-fs/udev/udev-197-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.21 2013/01/24 10:36:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.22 2013/01/27 06:10:29 ssuominen Exp $
 
 EAPI=4
 
@@ -382,7 +382,7 @@ pkg_preinst()
 				/usr/share/gtk-doc/html/${htmldir}
 		fi
 	done
-	preserve_old_lib /$(get_libdir)/libudev.so.0
+	preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
 }
 
 # This function determines if a directory is a mount point.
@@ -510,7 +510,7 @@ pkg_postinst()
 	ewarn "The method you use to do this depends on your init system."
 	ewarn
 
-	preserve_old_lib_notify /$(get_libdir)/libudev.so.0
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
 
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 433070a098e0..1199b46fa645 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.163 2013/01/24 10:36:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.164 2013/01/27 06:10:29 ssuominen Exp $
 
 EAPI=4
 
@@ -382,7 +382,7 @@ pkg_preinst()
 				/usr/share/gtk-doc/html/${htmldir}
 		fi
 	done
-	preserve_old_lib /$(get_libdir)/libudev.so.0
+	preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
 }
 
 # This function determines if a directory is a mount point.
@@ -510,7 +510,7 @@ pkg_postinst()
 	ewarn "The method you use to do this depends on your init system."
 	ewarn
 
-	preserve_old_lib_notify /$(get_libdir)/libudev.so.0
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
 
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"