diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-27 23:35:41 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-27 23:35:41 +0000 |
| commit | 9734fc14f0f144d129c0492217a89159f1c4bcca (patch) | |
| tree | aba02f78213718880da9db83a643716c930ad23a /net-nds/openldap | |
| parent | Version bump. Also fix bug #288833 for --as-needed. (diff) | |
| download | historical-9734fc14f0f144d129c0492217a89159f1c4bcca.tar.gz historical-9734fc14f0f144d129c0492217a89159f1c4bcca.tar.bz2 historical-9734fc14f0f144d129c0492217a89159f1c4bcca.zip | |
Check previously used version of sys-libs/db only with USE="berkdb".
Package-Manager: portage-14908-svn/cvs/Linux x86_64
Diffstat (limited to 'net-nds/openldap')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/Manifest | 4 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.19-r1.ebuild | 28 |
3 files changed, 22 insertions, 16 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/Manifest b/net-nds/openldap/Manifest index 58f6ffde1268..d8fbd2c19f1f 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -27,7 +27,7 @@ EBUILD openldap-2.3.43.ebuild 17845 RMD160 14dc97d9b79dbde77f124eeeebd162b5ea612 EBUILD openldap-2.4.16.ebuild 15152 RMD160 54d5cced13910c8f81edc117a3dfb8db86248341 SHA1 a590c2e7aaf4a04459a76e755d26cb3747156305 SHA256 053f2dff9a03af6d2994d61fe01f637245e09744d3fc3a0bd62c7630d7004783 EBUILD openldap-2.4.17-r1.ebuild 17425 RMD160 520100a05855c69c52dc0f952de15aae52d897ea SHA1 1034ffe92aca9986e0161c4473d3fe2d514cfcfd SHA256 0c900a92d19fec9b5300afcde77cf4ea4eed34e62e46f22cf1df9474b6e8a7bf EBUILD openldap-2.4.17.ebuild 15151 RMD160 dda10856a90ba7ddc898aab52f0cce079f067827 SHA1 453df712daf1861d39463ad2d05e127d43b53443 SHA256 9d65d9e3cef1badbda001ff5e79216d896a3865634d56f2e9b04664306e0ed4d -EBUILD openldap-2.4.19-r1.ebuild 18313 RMD160 4b0b163a3d84f657679ac4771b0a3b3a52ee4ae6 SHA1 027507f7ff26b31098644efa03f59d722687f296 SHA256 7711773aa069304c10bf9d1019f40b7db659929e056f01f6b647021614407eae +EBUILD openldap-2.4.19-r1.ebuild 18354 RMD160 1a4b2526e75034d00777c27410af59bc4afc16e9 SHA1 3593792ca31f27229737f6596c8841ed2f0a9104 SHA256 1bb1cd97c95cd96a20a0f451bde349698f6f11c517f634738061f847aa4cdf04 EBUILD openldap-2.4.19.ebuild 17501 RMD160 7058461881bc146836cba0a8e9f867a7fd8728bc SHA1 f27435f04fafbf477bbb23f3d67900aac4e1bfb7 SHA256 afa573819347dd063fe4f67fccd606110da567ba143fdf52f3800f1080c436ba -MISC ChangeLog 61420 RMD160 910971d17ccf77fcf41bf9a0a30c734d029734f5 SHA1 88694b82606e515b6185c3d21aca9638b28cd0aa SHA256 c99f4163315a2f6984c1ded7aa461f9c0651d70b499b4df1eb6841e83a15a58b +MISC ChangeLog 61595 RMD160 37ad41506bc0541ed0356c11538f3362056beb48 SHA1 93a64c36927a4cb1117c42c886bac83e0b6ba05d SHA256 7c3744ee6a117d2d1031a3e43b37a743901600f590f1fdcb6c5b7f5a2f51f010 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e 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 |