Fix lib preservation for bug #205220

Package-Manager: portage-2.1.4_rc14

5 files changed, 33 insertions, 39 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 6b7c399348ff..881cb0c1a505 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.307 2008/01/13 21:24:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.308 2008/01/13 21:31:14 jokey Exp $
+
+  13 Jan 2008; Markus Ullmann <jokey@gentoo.org> openldap-2.3.39-r2.ebuild,
+  openldap-2.3.40-r1.ebuild, openldap-2.4.7.ebuild:
+  Fix lib preservation for bug #205220
 
 *openldap-2.4.7 (13 Jan 2008)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index adb27b6ec87a..f3241757cec3 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -57,22 +57,22 @@ EBUILD openldap-2.3.39-r1.ebuild 17576 RMD160 9bb0e714cbcdb42ed97e8eac344fc19294
 MD5 4a856571e6417904e291fd9bdf65bb97 openldap-2.3.39-r1.ebuild 17576
 RMD160 9bb0e714cbcdb42ed97e8eac344fc19294a873d8 openldap-2.3.39-r1.ebuild 17576
 SHA256 d0cc0cda8c90ce224ffa7ec6ea5e5d1769c01e543948caa97ea8f4f028f3c996 openldap-2.3.39-r1.ebuild 17576
-EBUILD openldap-2.3.39-r2.ebuild 17543 RMD160 3f45afd5b94639ffe6a4bbd0dca7fc51aa04bf8e SHA1 9d4db736eda36bbc4cba0fd6de47c4be18b2d31f SHA256 dec3427d41d611976d45b746b79979f476b291789a6d5f44980ac1e6630e5fcf
-MD5 a3b2ab68ccc02451d16de74112a83520 openldap-2.3.39-r2.ebuild 17543
-RMD160 3f45afd5b94639ffe6a4bbd0dca7fc51aa04bf8e openldap-2.3.39-r2.ebuild 17543
-SHA256 dec3427d41d611976d45b746b79979f476b291789a6d5f44980ac1e6630e5fcf openldap-2.3.39-r2.ebuild 17543
-EBUILD openldap-2.3.40-r1.ebuild 17551 RMD160 3849ae7603b8232dc91298e2e74d873fb0961800 SHA1 576a4a142da9baad2ca6bfcb2b9bcd1a7418661a SHA256 6d28630f700e3df6b8e2fcd19eae546a347104d55d4ee228ac7fd32edf6977ce
-MD5 ad5b27809619e38a9816878e0f9707e8 openldap-2.3.40-r1.ebuild 17551
-RMD160 3849ae7603b8232dc91298e2e74d873fb0961800 openldap-2.3.40-r1.ebuild 17551
-SHA256 6d28630f700e3df6b8e2fcd19eae546a347104d55d4ee228ac7fd32edf6977ce openldap-2.3.40-r1.ebuild 17551
-EBUILD openldap-2.4.7.ebuild 11210 RMD160 f51ee20427499ff9cf70ce06fbfe76924072e88f SHA1 af3c8e6d6aa3d0160cd784c1f594359554c72392 SHA256 ff22ad76fe4852a95cb3e9b64764b2685b82862855fdc8e477844780cb0b3c2d
-MD5 9d33cb395ec5e6ec311de4d0b2e58c74 openldap-2.4.7.ebuild 11210
-RMD160 f51ee20427499ff9cf70ce06fbfe76924072e88f openldap-2.4.7.ebuild 11210
-SHA256 ff22ad76fe4852a95cb3e9b64764b2685b82862855fdc8e477844780cb0b3c2d openldap-2.4.7.ebuild 11210
-MISC ChangeLog 52518 RMD160 72ea4c521694fae466e28e0e1b2a5e6903e76817 SHA1 e01282a1640b62d3d324c1704044b7d55138a606 SHA256 d2a8cdb8315100eeeb86cf5e24f327934055eda35cf24a9c9fecb6389adf1659
-MD5 36d528bd728ad98e4c00cac153c831df ChangeLog 52518
-RMD160 72ea4c521694fae466e28e0e1b2a5e6903e76817 ChangeLog 52518
-SHA256 d2a8cdb8315100eeeb86cf5e24f327934055eda35cf24a9c9fecb6389adf1659 ChangeLog 52518
+EBUILD openldap-2.3.39-r2.ebuild 17527 RMD160 cea72b866963b61fa1b4da8703d4e86d5fdf66c2 SHA1 12fd3eb96f8bfa72b4118f72338582f7a5ac1f19 SHA256 832a6157281008fe36ce44511b7c90d72129d9c65931d12ee07ca4f1a5c5c0e6
+MD5 833eaac880d238f85ec1ffef58ee7297 openldap-2.3.39-r2.ebuild 17527
+RMD160 cea72b866963b61fa1b4da8703d4e86d5fdf66c2 openldap-2.3.39-r2.ebuild 17527
+SHA256 832a6157281008fe36ce44511b7c90d72129d9c65931d12ee07ca4f1a5c5c0e6 openldap-2.3.39-r2.ebuild 17527
+EBUILD openldap-2.3.40-r1.ebuild 17537 RMD160 571c0165da2c7f95ca851f58fe771f2a509ce09f SHA1 4fb73c2e106d12886ed651661b6b78783abc25b0 SHA256 5340dcf344460dded206972b1f52e1b85e9c81d8cb3a6837511e213e6e810d9b
+MD5 d15094f191beacb12796d939076d005a openldap-2.3.40-r1.ebuild 17537
+RMD160 571c0165da2c7f95ca851f58fe771f2a509ce09f openldap-2.3.40-r1.ebuild 17537
+SHA256 5340dcf344460dded206972b1f52e1b85e9c81d8cb3a6837511e213e6e810d9b openldap-2.3.40-r1.ebuild 17537
+EBUILD openldap-2.4.7.ebuild 10980 RMD160 9efa46efc93cc1f08a9172da3779c5d81beaa9c6 SHA1 218a1636b41e9eabb8789f7188afd9d9e04e6ccb SHA256 40b1d3d360ad0d97f66989b8fdfe3f1a1586045bbf4e1f40944a0399bb4a6fa1
+MD5 6e52b1268fb59bf7838f401aa64b8916 openldap-2.4.7.ebuild 10980
+RMD160 9efa46efc93cc1f08a9172da3779c5d81beaa9c6 openldap-2.4.7.ebuild 10980
+SHA256 40b1d3d360ad0d97f66989b8fdfe3f1a1586045bbf4e1f40944a0399bb4a6fa1 openldap-2.4.7.ebuild 10980
+MISC ChangeLog 52686 RMD160 7cf2b7ae77fc64ec70028006ed3d714149a79576 SHA1 e15f4748b7bb3e3394dbc83a5ffbf1a0f38dd900 SHA256 781266345aa9523e3af03cdcaeceebd5f3e5e3c6e265b068a10c5caaaa8d4d35
+MD5 108e8ad4d2f41b6585e6906f298ab73c ChangeLog 52686
+RMD160 7cf2b7ae77fc64ec70028006ed3d714149a79576 ChangeLog 52686
+SHA256 781266345aa9523e3af03cdcaeceebd5f3e5e3c6e265b068a10c5caaaa8d4d35 ChangeLog 52686
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -95,7 +95,7 @@ SHA256 78fa231d11a7b6c762a594bdba85699572afb836325d12b14155f64e7f67b492 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHioGvz974XjDVpbkRAoRrAJ9fOK+U/2j3xaPTlpuiKNDkOFgwAwCgsvrK
-pT5esdUy1W0aP3DaLhIPevw=
-=D67+
+iD8DBQFHioMpz974XjDVpbkRAvSbAKCHHN/KVTQqhP6rcfRfFMVdfouoSQCgwp33
+Q62fDMArmn/iARPDW0vkyY8=
+=Y/0w
 -----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/openldap-2.3.39-r2.ebuild b/net-nds/openldap/openldap-2.3.39-r2.ebuild
index 1fb33a309058..6b096129a1c5 100644
--- a/net-nds/openldap/openldap-2.3.39-r2.ebuild
+++ b/net-nds/openldap/openldap-2.3.39-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r2.ebuild,v 1.8 2008/01/10 14:41:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r2.ebuild,v 1.9 2008/01/13 21:31:14 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -462,7 +462,7 @@ pkg_preinst() {
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
 		for each in liblber libldap libldap_r ; do
-			preserve_old_lib "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
+			preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
 }
@@ -506,7 +506,7 @@ pkg_postinst() {
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
 		for each in liblber libldap libldap_r ; do
-			preserve_old_lib_notify "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
+			preserve_old_lib_notify "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
 }
diff --git a/net-nds/openldap/openldap-2.3.40-r1.ebuild b/net-nds/openldap/openldap-2.3.40-r1.ebuild
index d9a3085088e1..982b795720d1 100644
--- a/net-nds/openldap/openldap-2.3.40-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40-r1.ebuild,v 1.1 2008/01/09 23:14:25 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40-r1.ebuild,v 1.2 2008/01/13 21:31:14 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -462,7 +462,7 @@ pkg_preinst() {
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
 		for each in liblber libldap libldap_r ; do
-			preserve_old_lib "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
+			preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
 }
@@ -506,7 +506,7 @@ pkg_postinst() {
 	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
 	for LIBSUFFIX in ${LIBSUFFIXES} ; do
 		for each in liblber libldap libldap_r ; do
-			preserve_old_lib_notify "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
+			preserve_old_lib_notify "usr/$(get_libdir)/${each}${LIBSUFFIX}"
 		done
 	done
 }
diff --git a/net-nds/openldap/openldap-2.4.7.ebuild b/net-nds/openldap/openldap-2.4.7.ebuild
index e1614d869488..e39e496da3fa 100644
--- a/net-nds/openldap/openldap-2.4.7.ebuild
+++ b/net-nds/openldap/openldap-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.7.ebuild,v 1.1 2008/01/13 21:24:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.7.ebuild,v 1.2 2008/01/13 21:31:14 jokey Exp $
 
 EAPI="1"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator
@@ -297,12 +297,7 @@ src_install() {
 
 pkg_preinst() {
 	# keep old libs if any
-	LIBSUFFIXES="-2.3.so.0"
-	for LIBSUFFIX in ${LIBSUFFIXES} ; do
-		for each in liblber libldap libldap_r ; do
-			preserve_old_lib "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
-		done
-	done
+	preserve_old_lib usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
 }
 
 pkg_postinst() {
@@ -333,10 +328,5 @@ pkg_postinst() {
 	elog "An example file for tuning BDB backends with openldap is:"
 	elog "/usr/share/doc/${PF}/DB_CONFIG.fast.example.gz"
 
-	LIBSUFFIXES="-2.3.so.0"
-	for LIBSUFFIX in ${LIBSUFFIXES} ; do
-		for each in liblber libldap libldap_r ; do
-			preserve_old_lib_notify "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
-		done
-	done
+	preserve_old_lib_notify usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
 }