Fix preserve libs position

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 42242aa12331579a1580c0d50d10dc8a221b7de0..3200aa828e389b6f2c31d8d8c8bed078173d64b8 100644 (file)
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.252 2007/01/13 12:20:14 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.253 2007/01/16 21:40:29 jokey Exp $
+
+  16 Jan 2007; Markus Ullmann <jokey@gentoo.org> openldap-2.2.28-r7.ebuild,
+  openldap-2.3.30-r2.ebuild, openldap-2.3.31-r1.ebuild:
+  Fix preserve libs position
 
   13 Jan 2007; Markus Ullmann <jokey@gentoo.org> openldap-2.1.30-r10.ebuild,
   openldap-2.2.28-r7.ebuild, openldap-2.3.30-r2.ebuild:

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 18c677462744dfdbaefc62fe2074b9a95e6b851a..396e767f2aa5c95ed9b4e5b07621f13007a81d6f 100644 (file)
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -135,10 +135,10 @@ EBUILD openldap-2.2.28-r6.ebuild 12065 RMD160 c62172c3e59d5c9f918a865dfdebba9d89
 MD5 a0d15f76c54b00d40cac2aa29c14e8c7 openldap-2.2.28-r6.ebuild 12065
 RMD160 c62172c3e59d5c9f918a865dfdebba9d89d0bc4b openldap-2.2.28-r6.ebuild 12065
 SHA256 2ae8e1b9792dcda472c96a525429ec4b351c48e4b116a7727a8c6293420a7a61 openldap-2.2.28-r6.ebuild 12065
-EBUILD openldap-2.2.28-r7.ebuild 11671 RMD160 06047687a1331d941712dd11326aed4184bdb5b0 SHA1 01483866d106e5fc3259767eb9ee4fcfa9cc9f5b SHA256 4ae9652af3b9eb9f67e8cf2da1c867473d90bb53c76bcc06472515041da753ba
-MD5 dfda8509b774d9ab0d3d00beae4c7a95 openldap-2.2.28-r7.ebuild 11671
-RMD160 06047687a1331d941712dd11326aed4184bdb5b0 openldap-2.2.28-r7.ebuild 11671
-SHA256 4ae9652af3b9eb9f67e8cf2da1c867473d90bb53c76bcc06472515041da753ba openldap-2.2.28-r7.ebuild 11671
+EBUILD openldap-2.2.28-r7.ebuild 11690 RMD160 7e10007ee4140155ba7021122f5e3427f2c047e3 SHA1 cd473dab5ee5e855d4f7c584baac205f231e43d1 SHA256 346fca2b0b836baa039bdf4fa025ffc4103c7e0df7037ec5303e91b330076f7e
+MD5 3c00b16ab378359fd1633ef32e452779 openldap-2.2.28-r7.ebuild 11690
+RMD160 7e10007ee4140155ba7021122f5e3427f2c047e3 openldap-2.2.28-r7.ebuild 11690
+SHA256 346fca2b0b836baa039bdf4fa025ffc4103c7e0df7037ec5303e91b330076f7e openldap-2.2.28-r7.ebuild 11690
 EBUILD openldap-2.3.24-r1.ebuild 14268 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 SHA1 159add9ffaea974e73cc15edfde3cd48dd1ea31c SHA256 7568e3e249db5b4045a9326c40bcdf356649e70fe49de3ca15a8dab77b7f0e42
 MD5 de5dd9e1c32a1488d167678c67afbaa4 openldap-2.3.24-r1.ebuild 14268
 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 openldap-2.3.24-r1.ebuild 14268
@@ -151,18 +151,18 @@ EBUILD openldap-2.3.30-r1.ebuild 16702 RMD160 fe8ed68bb49f2184443a928f149aad4008
 MD5 ad67c38598307c2bfe7a46b862357a50 openldap-2.3.30-r1.ebuild 16702
 RMD160 fe8ed68bb49f2184443a928f149aad4008fdc654 openldap-2.3.30-r1.ebuild 16702
 SHA256 e661420c05c760161273446fe95cadd9312e8a5b394c2d920e9ec1287eeee6a8 openldap-2.3.30-r1.ebuild 16702
-EBUILD openldap-2.3.30-r2.ebuild 16329 RMD160 9d45b72acf74f6e2711ac6e8f85f4da9aa0235e0 SHA1 6ab6dbdf5d41aa7e8444e4cdcc7f230d34d95429 SHA256 82e798ebbf0eb1067bbf544395f10a9129a55a6f98d82839746d24016a6390e7
-MD5 c6bbf45760ad143112aafa85589712aa openldap-2.3.30-r2.ebuild 16329
-RMD160 9d45b72acf74f6e2711ac6e8f85f4da9aa0235e0 openldap-2.3.30-r2.ebuild 16329
-SHA256 82e798ebbf0eb1067bbf544395f10a9129a55a6f98d82839746d24016a6390e7 openldap-2.3.30-r2.ebuild 16329
-EBUILD openldap-2.3.31-r1.ebuild 16335 RMD160 eb0d44192d2572833a9f858d0eeec410cc3a3c4e SHA1 10315aa21a8c233c41526b773ceb7432665d3345 SHA256 c9a38cbc416c517d4c19e828aa049e578cc1e7b452e1e1793352afa7cfe18ed0
-MD5 37498d7bb09e2af6cdce9e0387a1d56a openldap-2.3.31-r1.ebuild 16335
-RMD160 eb0d44192d2572833a9f858d0eeec410cc3a3c4e openldap-2.3.31-r1.ebuild 16335
-SHA256 c9a38cbc416c517d4c19e828aa049e578cc1e7b452e1e1793352afa7cfe18ed0 openldap-2.3.31-r1.ebuild 16335
-MISC ChangeLog 43721 RMD160 f0986d9b487208cab37ac3ce6e73139633306443 SHA1 6e61b07574e7a8994b99c4f8557bb044ad499f15 SHA256 9042f1e659114e9f7f477e3e5c6882da72f71d903a14e32ce02a11f03c416e23
-MD5 2c54bee0f11528d7c7daf4ee56426ffe ChangeLog 43721
-RMD160 f0986d9b487208cab37ac3ce6e73139633306443 ChangeLog 43721
-SHA256 9042f1e659114e9f7f477e3e5c6882da72f71d903a14e32ce02a11f03c416e23 ChangeLog 43721
+EBUILD openldap-2.3.30-r2.ebuild 16346 RMD160 b4b10793736c3fc8ba65b6ef8b231cd48d49d358 SHA1 6907ca9830522486a9e97cc5be3380d012f9830e SHA256 541b7c33bbc905a06c667abf566cd524db64f3c6d0c8127cb57b636185f5914e
+MD5 51b7d2c8e2c9e8fd198c069c3dad003a openldap-2.3.30-r2.ebuild 16346
+RMD160 b4b10793736c3fc8ba65b6ef8b231cd48d49d358 openldap-2.3.30-r2.ebuild 16346
+SHA256 541b7c33bbc905a06c667abf566cd524db64f3c6d0c8127cb57b636185f5914e openldap-2.3.30-r2.ebuild 16346
+EBUILD openldap-2.3.31-r1.ebuild 16348 RMD160 5abadd6d9fbefde9f976f9b13947f85241c08242 SHA1 2157b88ec4ee82e53fce7b25222d757503248001 SHA256 799a010f3f0555be34e7e7f88a4880afdf25dd44039d69dd591cc193808b10af
+MD5 a624b97aa763533c487a911740b798f0 openldap-2.3.31-r1.ebuild 16348
+RMD160 5abadd6d9fbefde9f976f9b13947f85241c08242 openldap-2.3.31-r1.ebuild 16348
+SHA256 799a010f3f0555be34e7e7f88a4880afdf25dd44039d69dd591cc193808b10af openldap-2.3.31-r1.ebuild 16348
+MISC ChangeLog 43883 RMD160 a120c480b6c45aa715f43da810d4a7bf16db415b SHA1 36c29ade449759c8c9fa7d81579ac6240ab6f48b SHA256 241fe815eb662a5b778e88f69ae24994093f299fc437af4a9b2e7845b83eb9f7
+MD5 7edf92ab1ee4e39c784e22212653982e ChangeLog 43883
+RMD160 a120c480b6c45aa715f43da810d4a7bf16db415b ChangeLog 43883
+SHA256 241fe815eb662a5b778e88f69ae24994093f299fc437af4a9b2e7845b83eb9f7 ChangeLog 43883
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -203,7 +203,7 @@ SHA256 1da7f61889e0b638a15aa1fbcefb9b5df99ea1ed92b83196fc9c9b12e08527aa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFrUUu8bi6rjpTunYRAuB/AKDgXE/fCsFuBUHUOFkjjOmSafHtXwCgpyrm
-DugoUxyG+pH1dL1MdariINQ=
-=VCL/
+iD8DBQFFrUYvz974XjDVpbkRAgHZAJ4yHsfeYopaOa70aptKrQfi0DOrYgCffXrg
+mWwofkuYxTNbFrKN0Tdty3Q=
+=AQEr
 -----END PGP SIGNATURE-----

diff --git a/net-nds/openldap/openldap-2.2.28-r7.ebuild b/net-nds/openldap/openldap-2.2.28-r7.ebuild
index f2808c299fa13cb2ba4067bbb5ca26ca99db18b4..f9002b38c00e45f2b417804f9a0af3bdeebbb89f 100644 (file)
--- a/net-nds/openldap/openldap-2.2.28-r7.ebuild
+++ b/net-nds/openldap/openldap-2.2.28-r7.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/net-nds/openldap/openldap-2.2.28-r7.ebuild,v 1.9 2007/01/13 12:20:14 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r7.ebuild,v 1.10 2007/01/16 21:40:29 jokey Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -292,7 +292,9 @@ src_install() {
                        die "failed to install kerberos passwd module"
                fi
        fi
+}
 
+pkg_preinst() {
        # keep old libs if needed
        for each in lber.so.2.0.130 libldap.so.2.0.130 libldap_r.so.2.0.130 ; do
                preserve_old_lib "${ROOT}usr/$(get_libdir)/${each}"

diff --git a/net-nds/openldap/openldap-2.3.30-r2.ebuild b/net-nds/openldap/openldap-2.3.30-r2.ebuild
index ec3adf0e17af45da2ed5141ce8937334fdc15f9f..31b88eabc98a595b183c148de819209673775750 100644 (file)
--- a/net-nds/openldap/openldap-2.3.30-r2.ebuild
+++ b/net-nds/openldap/openldap-2.3.30-r2.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/net-nds/openldap/openldap-2.3.30-r2.ebuild,v 1.10 2007/01/16 21:35:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.30-r2.ebuild,v 1.11 2007/01/16 21:40:29 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -441,7 +441,9 @@ src_install() {
                fi
 
        fi
+}
 
+pkg_preinst() {
        # keep old libs if any
        LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
        for LIBSUFFIX in ${LIBSUFFIXES} ; do

diff --git a/net-nds/openldap/openldap-2.3.31-r1.ebuild b/net-nds/openldap/openldap-2.3.31-r1.ebuild
index 67104140b7b2d8897c4a96462ae2a16692a1f3a6..1ab309659325a694a50a0264993945fb537389e3 100644 (file)
--- a/net-nds/openldap/openldap-2.3.31-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.31-r1.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/net-nds/openldap/openldap-2.3.31-r1.ebuild,v 1.2 2007/01/09 15:12:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.31-r1.ebuild,v 1.3 2007/01/16 21:40:29 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -441,7 +441,9 @@ src_install() {
                fi
 
        fi
+}
 
+pkg_preinst() {
        # keep old libs if any
        LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
        for LIBSUFFIX in ${LIBSUFFIXES} ; do