diff options
Diffstat (limited to 'net-nds/openldap')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.3.39-r2.ebuild | 6 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.3.40-r1.ebuild | 6 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.7.ebuild | 16 |
4 files changed, 14 insertions, 20 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/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 } |