diff options
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.19-r1.ebuild | 28 |
2 files changed, 20 insertions, 14 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index dd6aa2206ad6..7caa5a10ac8b 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.358 2009/11/24 23:31:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.359 2009/11/27 23:35:41 arfrever Exp $ + + 27 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + openldap-2.4.19-r1.ebuild: + Check previously used version of sys-libs/db only with USE="berkdb". 24 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> openldap-2.4.17.ebuild, openldap-2.4.17-r1.ebuild, openldap-2.4.19.ebuild, diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild index e476a61d0180..93870eebda07 100644 --- a/net-nds/openldap/openldap-2.4.19-r1.ebuild +++ b/net-nds/openldap/openldap-2.4.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.3 2009/11/24 23:31:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.4 2009/11/27 23:35:41 arfrever Exp $ EAPI="2" inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs @@ -118,18 +118,20 @@ openldap_find_versiontags() { fi done - # Now we must check for the major version of sys-libs/db linked against. - SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd - if [ -f "${SLAPD_PATH}" ]; then - OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ - | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" - NEWVER="$(db_findver sys-libs/db)" - if [ "${OLDVER}" != "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will build against" - eerror " ${NEWVER} and your database would be inaccessible." - echo - openldap_upgrade_howto + if use berkdb ; then + # Now we must check for the major version of sys-libs/db linked against. + SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd + if [ -f "${SLAPD_PATH}" ]; then + OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ + | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" + NEWVER="$(db_findver sys-libs/db)" + if [ "${OLDVER}" != "${NEWVER}" ]; then + eerror " Your existing version of OpenLDAP was built against" + eerror " sys-libs/db:${OLDVER}, but the new one will build against" + eerror " ${NEWVER} and your database would be inaccessible." + echo + openldap_upgrade_howto + fi fi fi |