diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-10-13 21:03:06 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-10-13 21:03:06 +0000 |
| commit | 87832ff9ae7f1a519d57ecb68710f531d147cb67 (patch) | |
| tree | a045d678604a6a7f65f5631b3000ce2f30b9bed1 /net-nds | |
| parent | Bump. (diff) | |
| download | gentoo-2-87832ff9ae7f1a519d57ecb68710f531d147cb67.tar.gz gentoo-2-87832ff9ae7f1a519d57ecb68710f531d147cb67.tar.bz2 gentoo-2-87832ff9ae7f1a519d57ecb68710f531d147cb67.zip | |
Bug #440470: Clean up elog stuff with Arfrever's suggestion.
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.40.ebuild | 20 |
2 files changed, 16 insertions, 9 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index c7616ff7efc3..520e881737c3 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.479 2014/10/13 09:30:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.480 2014/10/13 21:03:06 robbat2 Exp $ + + 13 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.4.40.ebuild: + Bug #440470: Clean up elog stuff with Arfrever's suggestion. 13 Oct 2014; Michał Górny <mgorny@gentoo.org> openldap-2.4.40.ebuild: Wrap lmdb.h for USE=-minimal, bug #525220. diff --git a/net-nds/openldap/openldap-2.4.40.ebuild b/net-nds/openldap/openldap-2.4.40.ebuild index 39da70adcf3c..7b769cbbc613 100644 --- a/net-nds/openldap/openldap-2.4.40.ebuild +++ b/net-nds/openldap/openldap-2.4.40.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild,v 1.3 2014/10/13 09:30:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild,v 1.4 2014/10/13 21:03:06 robbat2 Exp $ EAPI="5" @@ -764,6 +764,10 @@ multilib_src_install_all() { pkg_preinst() { # keep old libs if any preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0) + # bug 440470, only display the getting started help there was no openldap before, + # or we are going to a non-minimal build + ! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]' + OPENLDAP_PRINT_MESSAGES=$((! $?)) } pkg_postinst() { @@ -795,13 +799,13 @@ pkg_postinst() { use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data fi - if ! has_version 'net-nds/openldap'; then - elog "Getting started using OpenLDAP? There is some documentation available:" - elog "Gentoo Guide to OpenLDAP Authentication" - elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" + if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then + elog "Getting started using OpenLDAP? There is some documentation available:" + elog "Gentoo Guide to OpenLDAP Authentication" + elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" + elog "---" + elog "An example file for tuning BDB backends with openldap is" + elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" fi preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0) |